Fix P4Merge text argument order - #769
Merged
Merged
Conversation
p4merge takes its two files positionally as `left right`, so the file
named first is the one shown on the left. The text branches had them the
wrong way round: Left emitted `"{temp}" "{target}"` and Right emitted
`"{target}" "{temp}"`, the inverse of the binary branches directly below
them and of every other tool definition.
So a default launch, which uses Right, opened with the target on the
left, and setting DiffEngine_TargetOnLeft flipped it the wrong way. The
generated docs recorded the same inversion.
Introduced by ff21ccc, which truncated the old four argument merge form
`base left right merged` to its first two arguments, leaving what had
been the base sitting in the left slot.
This was referenced Aug 26, 2026
This was referenced Aug 27, 2026
Closed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
p4merge takes its two files positionally as
left right, so the file named first is the one shown on the left. The text branches had them the wrong way round: Left emitted"{temp}" "{target}"and Right emitted"{target}" "{temp}", the inverse of the binary branches directly below them and of every other tool definition.So a default launch, which uses Right, opened with the target on the left, and setting DiffEngine_TargetOnLeft flipped it the wrong way. The generated docs recorded the same inversion.
Introduced by ff21ccc, which truncated the old four argument merge form
base left right mergedto its first two arguments, leaving what had been the base sitting in the left slot.