-
-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Incorrect order of P4Merge args #372
Comments
does this look better VerifyTests/DiffEngine@9cf1d1b ? |
thanks for you help. this is now deployed (pending a nuget cache update) |
Thank you for the awesomely quick turnaround! |
no worries. as a aside, is the codebase you using this an OSS project? |
cool. what branch? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Preamble
Verify.Xunit v11.18.1
Describe the bug
P4Merge has the following args:
$BASE" "$LOCAL" "$REMOTE" "$MERGED"
, which appears to be reversed by the verifier.The verifier launched P4MErge with the following command:
"C:\Program Files\Perforce\p4merge.exe" "...received.txt" "....verified.txt" "....verified.txt" "....received.txt"
, which leads to the following:The command instead must be
"C:\Program Files\Perforce\p4merge.exe" "...received.txt" "....received.txt" "....verified.txt" "....verified.txt"
:Minimal Repro
Submit a PR that fixes the bug
If you point me to the source code I may be able to fix it.
The text was updated successfully, but these errors were encountered: