Downloads:

33,608

Downloads of v 2019.2.1883366:

0

Last Update:

12 Dec 2019

Package Maintainer(s):

Software Author(s):

  • Perforce Software
  • Inc.

Tags:

p4merge diff merge admin

P4Merge, the Perforce Visual Merge Tool

2019.2.1883366 | Updated: 12 Dec 2019

Downloads:

33,608

Downloads of v 2019.2.1883366:

0

Maintainer(s):

Software Author(s):

  • Perforce Software
  • Inc.

P4Merge, the Perforce Visual Merge Tool 2019.2.1883366

All Checks are Passing

2 Passing Test


Validation Testing Passed


Verification Testing Passed

Details

To install P4Merge, the Perforce Visual Merge Tool, run the following command from the command line or from PowerShell:

>

To upgrade P4Merge, the Perforce Visual Merge Tool, run the following command from the command line or from PowerShell:

>

To uninstall P4Merge, the Perforce Visual Merge Tool, run the following command from the command line or from PowerShell:

>

NOTE: This applies to both open source and commercial editions of Chocolatey.

1. Ensure you are set for organizational deployment

Please see the organizational deployment guide

  • Open Source or Commercial:
    • Proxy Repository - Create a proxy nuget repository on Nexus, Artifactory Pro, or a proxy Chocolatey repository on ProGet. Point your upstream to https://chocolatey.org/api/v2. Packages cache on first access automatically. Make sure your choco clients are using your proxy repository as a source and NOT the default community repository. See source command for more information.
    • You can also just download the package and push it to a repository Download

3. Enter your internal repository url

(this should look similar to https://chocolatey.org/api/v2)

4. Choose your deployment method:


choco upgrade p4merge -y --source="'STEP 3 URL'" [other options]

See options you can pass to upgrade.

See best practices for scripting.

Add this to a PowerShell script or use a Batch script with tools and in places where you are calling directly to Chocolatey. If you are integrating, keep in mind enhanced exit codes.

If you do use a PowerShell script, use the following to ensure bad exit codes are shown as failures:


choco upgrade p4merge -y --source="'STEP 3 URL'" 
$exitCode = $LASTEXITCODE

Write-Verbose "Exit code was $exitCode"
$validExitCodes = @(0, 1605, 1614, 1641, 3010)
if ($validExitCodes -contains $exitCode) {
  Exit 0
}

Exit $exitCode

- name: Ensure p4merge installed
  win_chocolatey:
    name: p4merge
    state: present
    version: 2019.2.1883366
    source: STEP 3 URL

See docs at https://docs.ansible.com/ansible/latest/modules/win_chocolatey_module.html.

Coming early 2020! Central Managment Reporting available now! More information...


chocolatey_package 'p4merge' do
  action    :install
  version  '2019.2.1883366'
  source   'STEP 3 URL'
end

See docs at https://docs.chef.io/resource_chocolatey_package.html.


Chocolatey::Ensure-Package
(
    Name: p4merge,
    Version: 2019.2.1883366,
    Source: STEP 3 URL
);

Requires Otter Chocolatey Extension. See docs at https://inedo.com/den/otter/chocolatey.


cChocoPackageInstaller p4merge
{
   Name     = 'p4merge'
   Ensure   = 'Present'
   Version  = '2019.2.1883366'
   Source   = 'STEP 3 URL'
}

Requires cChoco DSC Resource. See docs at https://github.com/chocolatey/cChoco.


package { 'p4merge':
  provider => 'chocolatey',
  ensure   => '2019.2.1883366',
  source   => 'STEP 3 URL',
}

Requires Puppet Chocolatey Provider module. See docs at https://forge.puppet.com/puppetlabs/chocolatey.


salt '*' chocolatey.install p4merge version="2019.2.1883366" source="STEP 3 URL"

See docs at https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.chocolatey.html.

5. If applicable - Chocolatey configuration/installation

See infrastructure management matrix for Chocolatey configuration elements and examples.

This package was approved as a trusted package on 12 Dec 2019.

Description

P4Merge is a visual diff tool that displays the differences between file versions and helps you to resolve conflicts and merge competing versions into one.


tools\chocolateyinstall.ps1

$ErrorActionPreference = 'Stop';

$packageName= 'P4Merge'
$toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$url        = 'https://filehost.perforce.com/perforce/r19.2/bin.ntx86/p4vinst.exe'
$url64bit   = 'https://filehost.perforce.com/perforce/r19.2/bin.ntx64/p4vinst64.exe'

$packageArgs = @{
  packageName   = $packageName
  unzipLocation = $toolsDir
  fileType      = 'EXE'
  url           = $url
  url64bit      = $url64bit

  softwareName  = 'Helix Core*'

  checksum      = '58ed8433499fa4efc5613a27ce0d5d4649f973dbeeaaebcdd4b36937464c5cbc'
  checksum64    = '0e064f1ef1f308c9af7b0f96db192119e331b7ab5c5c4a091ff9f7d091129fd1'
  checksumType  = 'SHA256'
  checksumType64= 'SHA256'

  validExitCodes= @(0, 3010, 1641)
  silentArgs   = '/s /V"/qn ADDLOCAL=P4MERGE,QT,QT32"'
}

$forceX86 = $env:chocolateyForceX86;
if (-not $forceX86) {
  if (Get-OSArchitectureWidth 64) {
    $packageArgs.silentArgs = '/s /V"/qn ADDLOCAL=P4MERGE,QT"'
  }
}

Install-ChocolateyPackage @packageArgs

No results available for this package. We are building up results for older packages over time so expect to see results. If this is a new package, it should have results within a day or two.

Version Downloads Last Updated Status
P4Merge, the Perforce Visual Merge Tool 2019.2.1856742 2294 Friday, October 18, 2019 Approved
P4Merge, the Perforce Visual Merge Tool 2019.1.1830398 4181 Thursday, August 22, 2019 Approved
P4Merge, the Perforce Visual Merge Tool 2018.3.1719708 7312 Monday, December 10, 2018 Approved
P4Merge, the Perforce Visual Merge Tool 2018.1.1637591 3888 Wednesday, April 4, 2018 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1573260 1904 Wednesday, October 4, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1535556 934 Monday, July 31, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1532340 582 Wednesday, July 19, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1518788 752 Friday, June 16, 2017 Approved
Discussion for the P4Merge, the Perforce Visual Merge Tool Package

Ground Rules:

  • This discussion is only about P4Merge, the Perforce Visual Merge Tool and the P4Merge, the Perforce Visual Merge Tool package. If you have feedback for Chocolatey, please contact the Google Group.
  • This discussion will carry over multiple versions. If you have a comment about a particular version, please note that in your comments.
  • The maintainers of this Chocolatey Package will be notified about new comments that are posted to this Disqus thread, however, it is NOT a guarantee that you will get a response. If you do not hear back from the maintainers after posting a message below, please follow up by using the link on the left side of this page or follow this link to contact maintainers. If you still hear nothing back, please follow the package triage process.
  • Tell us what you love about the package or P4Merge, the Perforce Visual Merge Tool, or tell us what needs improvement.
  • Share your experiences with the package, or extra configuration or gotchas that you've found.
  • If you use a url, the comment will be flagged for moderation until you've been whitelisted. Disqus moderated comments are approved on a weekly schedule if not sooner. It could take between 1-5 days for your comment to show up.
comments powered by Disqus