P2D3::Problem with P4Merge

Issue #122 resolved
Jason Gill
created an issue

I have P4Merge set up within mercurial as both an external diff and the merge tool. These are both working well from the command line.

I have setup MacHg to use the mercurial settings based on my ~/.hgrc. Diff works great from MacHg, using P4merge, but merging always generates the following message: "Mercurial reported error number 1: tool p4 requires a GUI warning: conflicts during merge. Merging test failed!

Any chance you could let me know what might be going wrong?

MacHG 0.9.8 with internal mercurial binary Mac OS X 10.6.4

Thanks,

Comments (4)

  1. Jason Harris repo owner

    - From the preferences add a drop down menu where you can select your external diffing tool. The setup should be automatic. If the diffing tool is not on your machine you will be warned. If it is on your machine then MacHg will configure its /Library/ Application Support/MacHg/hgrc file for this diff tool. - Diff tools currently supported are: FileMerge, AraxisMerge, P4Merge, DiffMerge, KDiff3, DelatWalker, Kaleidoscope, Changes, DiffFork, BBEdit, TextWrangler - Add some common diff tool settings directly to the hgrc so that the tool integration is easier. - (Thanks to the folks at Araxis I am allowed to include their scripts in MacHg!) - Add utility ensureFileExists:orCopyFromBundleResource: to ease the copying of files from the application bundle. - Fixes issue #76, #98, #122, #163

    Wiki macro error: Changeset 0e84e8688633 not found.

  2. Jason Harris repo owner

    - From the preferences add a drop down menu where you can select your external diffing tool. The setup should be automatic. If the diffing tool is not on your machine you will be warned. If it is on your machine then MacHg will configure its /Library/ Application Support/MacHg/hgrc file for this diff tool. - Diff tools currently supported are: FileMerge, AraxisMerge, P4Merge, DiffMerge, KDiff3, DelatWalker, Kaleidoscope, Changes, DiffFork, BBEdit, TextWrangler - Add some common diff tool settings directly to the hgrc so that the tool integration is easier. - (Thanks to the folks at Araxis I am allowed to include their scripts in MacHg!) - Add utility ensureFileExists:orCopyFromBundleResource: to ease the copying of files from the application bundle. - Fixes issue #76, #98, #122, #163

    bdf99aad9554

  3. Log in to comment