Unpacking Software Livestream

Join our monthly Unpacking Software livestream to hear about the latest news, chat and opinion on packaging, software deployment and lifecycle management!

Learn More

Chocolatey Product Spotlight

Join the Chocolatey Team on our regular monthly stream where we put a spotlight on the most recent Chocolatey product releases. You'll have a chance to have your questions answered in a live Ask Me Anything format.

Learn More

Chocolatey Coding Livestream

Join us for the Chocolatey Coding Livestream, where members of our team dive into the heart of open source development by coding live on various Chocolatey projects. Tune in to witness real-time coding, ask questions, and gain insights into the world of package management. Don't miss this opportunity to engage with our team and contribute to the future of Chocolatey!

Learn More

Calling All Chocolatiers! Whipping Up Windows Automation with Chocolatey Central Management

Webinar from
Wednesday, 17 January 2024

We are delighted to announce the release of Chocolatey Central Management v0.12.0, featuring seamless Deployment Plan creation, time-saving duplications, insightful Group Details, an upgraded Dashboard, bug fixes, user interface polishing, and refined documentation. As an added bonus we'll have members of our Solutions Engineering team on-hand to dive into some interesting ways you can leverage the new features available!

Watch On-Demand
Chocolatey Community Coffee Break

Join the Chocolatey Team as we discuss all things Community, what we do, how you can get involved and answer your Chocolatey questions.

Watch The Replays
Chocolatey and Intune Overview

Webinar Replay from
Wednesday, 30 March 2022

At Chocolatey Software we strive for simple, and teaching others. Let us teach you just how simple it could be to keep your 3rd party applications updated across your devices, all with Intune!

Watch On-Demand
Chocolatey For Business. In Azure. In One Click.

Livestream from
Thursday, 9 June 2022

Join James and Josh to show you how you can get the Chocolatey For Business recommended infrastructure and workflow, created, in Azure, in around 20 minutes.

Watch On-Demand
The Future of Chocolatey CLI

Livestream from
Thursday, 04 August 2022

Join Paul and Gary to hear more about the plans for the Chocolatey CLI in the not so distant future. We'll talk about some cool new features, long term asks from Customers and Community and how you can get involved!

Watch On-Demand
Hacktoberfest Tuesdays 2022

Livestreams from
October 2022

For Hacktoberfest, Chocolatey ran a livestream every Tuesday! Re-watch Cory, James, Gary, and Rain as they share knowledge on how to contribute to open-source projects such as Chocolatey CLI.

Watch On-Demand

Downloads:

73,387

Downloads of v 2021.1.1:

1,298

Last Update:

20 Feb 2021

Package Maintainer(s):

Software Author(s):

  • Perforce Software
  • Inc.

Tags:

freeware p4merge diff merge admin

P4Merge, the Perforce Visual Merge Tool

This is not the latest version of P4Merge, the Perforce Visual Merge Tool available.

  • 1
  • 2
  • 3

2021.1.1 | Updated: 20 Feb 2021

Downloads:

73,387

Downloads of v 2021.1.1:

1,298

Maintainer(s):

Software Author(s):

  • Perforce Software
  • Inc.

P4Merge, the Perforce Visual Merge Tool 2021.1.1

This is not the latest version of P4Merge, the Perforce Visual Merge Tool available.

  • 1
  • 2
  • 3

Some Checks Have Failed or Are Not Yet Complete

Not All Tests Have Passed


Validation Testing Passed


Verification Testing Unknown


Scan Testing Successful:

No detections found in any package files

Details
Learn More

Deployment Method: Individual Install, Upgrade, & Uninstall

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:

>

Deployment Method:

NOTE

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

1. Enter Your Internal Repository Url

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


2. Setup Your Environment

1. Ensure you are set for organizational deployment

Please see the organizational deployment guide

2. Get the package into your environment

  • 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://community.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. Copy Your Script

choco upgrade p4merge -y --source="'INTERNAL REPO URL'" --version="'2021.1.1'" [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="'INTERNAL REPO URL'" --version="'2021.1.1'" 
$exitCode = $LASTEXITCODE

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

Exit $exitCode

- name: Install p4merge
  win_chocolatey:
    name: p4merge
    version: '2021.1.1'
    source: INTERNAL REPO URL
    state: present

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


chocolatey_package 'p4merge' do
  action    :install
  source   'INTERNAL REPO URL'
  version  '2021.1.1'
end

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


cChocoPackageInstaller p4merge
{
    Name     = "p4merge"
    Version  = "2021.1.1"
    Source   = "INTERNAL REPO URL"
}

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


package { 'p4merge':
  ensure   => '2021.1.1',
  provider => 'chocolatey',
  source   => 'INTERNAL REPO URL',
}

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


4. If applicable - Chocolatey configuration/installation

See infrastructure management matrix for Chocolatey configuration elements and examples.

NOTE

Private CDN cached downloads available for licensed customers. Never experience 404 breakages again! Learn more...

Package Approved

This package was approved as a trusted package on 20 Feb 2021.

Description

P4Merge

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.

Package-specific issue

If this package isn't up-to-date for some days, Create an issue

Support the package maintainer and Patreon


tools\chocolateyinstall.ps1
$ErrorActionPreference = 'Stop';

$packageName      = $env:ChocolateyPackageName
$toolsDir         = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
$url              = 'https://cdist2.perforce.com/perforce/r21.1/bin.ntx86/p4vinst.exe'
$url64            = 'https://cdist2.perforce.com/perforce/r21.1/bin.ntx64/p4vinst64.exe'
$checksum         = '40ddec492fc318e178d87c7b2fdf3bef794da551aa41d2a8f2efe276751b9f3f'
$checksumType     = 'sha256'
$checksum64       = 'e8e1563b201ec8ad34bb31612d0a4d4436eb95de700fcf1c14281acab5315cf6'
$checksumType64   = 'sha256'

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

  softwareName    = 'Helix Core*'

  checksum        = $checksum
  checksum64      = $checksum64
  checksumType    = $checksumType
  checksumType64  = $checksumType64

  validExitCodes= @(0, 3010, 1641)
  silentArgs   = '/s REMOVEAPPS=P4ADMIN,P4MERGE,P4'
}

$forceX86 = $env:chocolateyForceX86;
if (-not $forceX86) {
  if (Get-OSArchitectureWidth 64) {
    $packageArgs.silentArgs = '/s REMOVEAPPS=P4V,P4ADMIN,P4'
  }
}

Install-ChocolateyPackage @packageArgs

Log in or click on link to see number of positives.

In cases where actual malware is found, the packages are subject to removal. Software sometimes has false positives. Moderators do not necessarily validate the safety of the underlying software, only that a package retrieves software from the official distribution point and/or validate embedded software against official distribution point (where distribution rights allow redistribution).

Chocolatey Pro provides runtime protection from possible malware.

Add to Builder Version Downloads Last Updated Status
P4Merge, the Perforce Visual Merge Tool 2023.4.0 1157 Thursday, December 21, 2023 Approved
P4Merge, the Perforce Visual Merge Tool 2023.3.0 968 Tuesday, October 3, 2023 Approved
P4Merge, the Perforce Visual Merge Tool 2023.2 1743 Friday, May 19, 2023 Approved
P4Merge, the Perforce Visual Merge Tool 2023.1 1148 Tuesday, February 28, 2023 Approved
P4Merge, the Perforce Visual Merge Tool 2022.3.0.2022112301 1476 Sunday, November 27, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2022.3 856 Thursday, November 17, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2022.2 1884 Friday, July 1, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2022.1.1 943 Wednesday, May 18, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2022.1 1001 Wednesday, March 30, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2021.4.2 316 Friday, March 25, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2021.4.1 731 Saturday, February 26, 2022 Approved
P4Merge, the Perforce Visual Merge Tool 2021.1.2 3553 Wednesday, May 12, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2021.1.1 1298 Saturday, February 20, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2021.1 531 Friday, February 5, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210203 234 Wednesday, February 3, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210202 188 Tuesday, February 2, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210201 205 Monday, February 1, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210131 152 Sunday, January 31, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210130 125 Saturday, January 30, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210129 163 Friday, January 29, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210128 165 Thursday, January 28, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210127 201 Wednesday, January 27, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210126 187 Tuesday, January 26, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210125 189 Monday, January 25, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210124 137 Sunday, January 24, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210123 122 Saturday, January 23, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210122 158 Friday, January 22, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210121 163 Thursday, January 21, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210120 207 Wednesday, January 20, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20210119 156 Tuesday, January 19, 2021 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1.20201225 1017 Friday, December 25, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3.1 168 Thursday, December 24, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2020.3 536 Monday, December 7, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2020.2.20201107 707 Thursday, November 12, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2020.2.20200917 2001 Sunday, September 20, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2020.2.1 1087 Saturday, September 19, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2020.2 181 Saturday, August 22, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2019.2.1904275 8139 Tuesday, January 14, 2020 Approved
P4Merge, the Perforce Visual Merge Tool 2019.2.1883366 2441 Thursday, December 12, 2019 Approved
P4Merge, the Perforce Visual Merge Tool 2019.2.1856742 2760 Friday, October 18, 2019 Approved
P4Merge, the Perforce Visual Merge Tool 2019.1.1830398 4329 Thursday, August 22, 2019 Approved
P4Merge, the Perforce Visual Merge Tool 2018.3.1719708 7460 Monday, December 10, 2018 Approved
P4Merge, the Perforce Visual Merge Tool 2018.1.1637591 4064 Wednesday, April 4, 2018 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1573260 2062 Wednesday, October 4, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1535556 1074 Monday, July 31, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1532340 739 Wednesday, July 19, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.2.1518788 903 Friday, June 16, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2017.1.1491634 1196 Friday, April 7, 2017 Approved
P4Merge, the Perforce Visual Merge Tool 2015.2.1 1993 Thursday, November 3, 2016 Approved
P4Merge, the Perforce Visual Merge Tool 2014.1 4675 Monday, June 2, 2014 Approved
P4Merge, the Perforce Visual Merge Tool 2013.2 1588 Saturday, June 29, 2013 Approved
P4Merge, the Perforce Visual Merge Tool 2012.2 992 Sunday, November 25, 2012 Approved
P4Merge, the Perforce Visual Merge Tool 2011.1.1 758 Sunday, January 22, 2012 Approved
P4Merge, the Perforce Visual Merge Tool 2011.1 529 Thursday, January 12, 2012 Approved

Software

https://www.perforce.com/perforce/doc.current/user/p4vmergenotes.txt

Package


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