Search Options

Display Count
Sort
Preferred Language
Advanced Search

Results 1 - 10 of 179 for mergeV1 (0.07 seconds)

  1. cmd/data-usage-cache.go

    	}
    	for k, v := range d.Cache {
    		clone.Cache[k] = v.clone()
    	}
    	return clone
    }
    
    // merge root of other into d.
    // children of root will be flattened before being merged.
    // Last update time will be set to the last updated.
    func (d *dataUsageCache) merge(other dataUsageCache) {
    	existingRoot := d.root()
    	otherRoot := other.root()
    	if existingRoot == nil && otherRoot == nil {
    		return
    Created: Sun Apr 05 19:28:12 GMT 2026
    - Last Modified: Sun Sep 28 20:59:21 GMT 2025
    - 34.7K bytes
    - Click Count (0)
  2. compat/maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java

                Properties merged = new Properties();
                if (sourceDominant) {
                    merged.putAll(target.getProperties());
                    putAll(merged, source.getProperties(), CHILD_DIRECTORY_PROPERTY);
                } else {
                    putAll(merged, source.getProperties(), CHILD_DIRECTORY_PROPERTY);
                    merged.putAll(target.getProperties());
                }
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Wed Jul 23 17:27:08 GMT 2025
    - 13.4K bytes
    - Click Count (0)
  3. impl/maven-cli/src/test/java/org/apache/maven/cling/invoker/mvnup/goals/UpgradeResultTest.java

                        );
    
                UpgradeResult merged = result1.merge(result2);
    
                assertTrue(merged.success(), "Merged result should be successful");
                assertEquals(2, merged.processedPoms().size(), "Should merge processed POMs");
                assertEquals(2, merged.modifiedPoms().size(), "Should merge modified POMs");
                assertTrue(merged.processedPoms().contains(pom1), "Should contain overlapping POM");
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Sat Jun 07 06:22:47 GMT 2025
    - 9.4K bytes
    - Click Count (0)
  4. compat/maven-model/src/test/java/org/apache/maven/model/merge/MavenMergerTest.java

            Model source = Model.newBuilder().artifactId("SOURCE").build();
    
            Model merged = mavenMerger.merge(target, source, true, null);
            assertEquals(
                    "SOURCE",
                    merged.getArtifactId(),
                    "Expected merged artifactId to be SOURCE but was " + merged.getArtifactId());
    
            merged = mavenMerger.merge(target, source, false, null);
            assertEquals(
                    "TARGET",
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Wed Sep 17 10:01:14 GMT 2025
    - 3.6K bytes
    - Click Count (0)
  5. .github/workflows/close-linked-issue-when-merged-into-release.yml

    name: Close linked issues when PR merged into release
    
    on:
      pull_request:
        types: [closed]
        branches:
          - release
          - release7x
          - release8x
    
    permissions:
      issues: write
    
    jobs:
      closeIssueOnPrMerge:
        runs-on: ubuntu-latest
        steps:
          - name: Closes issues related to a merged pull request.
            uses: ldez/gha-mjolnir@df0e84242364946fa3ad4e7556510e8086ad681a
            env:
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Wed Jul 16 09:18:51 GMT 2025
    - 458 bytes
    - Click Count (0)
  6. compat/maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java

        }
    
        @Override
        public void merge(File existing, File result) throws RepositoryException {
            merge(existing != null ? existing.toPath() : null, result != null ? result.toPath() : null);
        }
    
        @Override
        public void merge(Path existing, Path result) throws RepositoryException {
            Metadata recessive = read(existing);
    
            merge(recessive);
    
            write(result, metadata);
    
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Fri Jun 06 14:28:57 GMT 2025
    - 4.2K bytes
    - Click Count (0)
  7. cmd/bucket-stats.go

    	Totals  [60]AccElem
    	LastMin int64
    }
    
    // Merge data of two ReplicationLastHour structure
    func (l ReplicationLastHour) merge(o ReplicationLastHour) (merged ReplicationLastHour) {
    	if l.LastMin > o.LastMin {
    		o.forwardTo(l.LastMin)
    		merged.LastMin = l.LastMin
    	} else {
    		l.forwardTo(o.LastMin)
    		merged.LastMin = o.LastMin
    	}
    
    	for i := range merged.Totals {
    		merged.Totals[i] = AccElem{
    Created: Sun Apr 05 19:28:12 GMT 2026
    - Last Modified: Sun Sep 28 20:59:21 GMT 2025
    - 13.5K bytes
    - Click Count (0)
  8. compat/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java

                metadata.storeInLocalRepository(localRepo, localRepo);
                merged = true;
            } catch (Exception e) {
                throw new RepositoryException(e.getMessage(), e);
            }
        }
    
        @Override
        public boolean isMerged() {
            return merged;
        }
    
        @Override
        public String getGroupId() {
            return emptify(metadata.getGroupId());
        }
    
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Fri Jun 06 14:28:57 GMT 2025
    - 4.5K bytes
    - Click Count (0)
  9. api/maven-api-xml/src/main/java/org/apache/maven/api/xml/XmlNode.java

         * @return the merged node
         *
         * @deprecated use {@link XmlService#merge(XmlNode, XmlNode, Boolean)} instead
         */
        @Deprecated(since = "4.0.0", forRemoval = true)
        @Nullable
        static XmlNode merge(@Nullable XmlNode dominant, @Nullable XmlNode recessive) {
            return XmlService.merge(dominant, recessive, null);
        }
    
        @Nullable
        static XmlNode merge(
    Created: Sun Apr 05 03:35:12 GMT 2026
    - Last Modified: Wed Dec 17 15:20:44 GMT 2025
    - 18.3K bytes
    - Click Count (0)
  10. .teamcity/scripts/CheckBadMerge.java

     * but sometimes changes on release notes.md was brought to master and merged unnoticed,
     * e.g https://github.com/gradle/gradle/pull/25825
     *
     * This script is to check if there is any merge commit that brings changes from release branch to master.
     *
     * Usage (Java 11+ single-file source execution):
     *   java .teamcity/scripts/CheckBadMerge.java < commits.txt
     *
     * If any "bad" merge commit is found, it will print the details and exit with non-zero code.
    Created: Wed Apr 01 11:36:16 GMT 2026
    - Last Modified: Mon Mar 30 16:25:09 GMT 2026
    - 9K bytes
    - Click Count (0)
Back to Top