Skip to content
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

Closed
RussKie opened this issue Jun 3, 2021 · 7 comments
Closed

Incorrect order of P4Merge args #372

RussKie opened this issue Jun 3, 2021 · 7 comments
Labels
Milestone

Comments

@RussKie
Copy link

RussKie commented Jun 3, 2021

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:
image

The command instead must be "C:\Program Files\Perforce\p4merge.exe" "...received.txt" "....received.txt" "....verified.txt" "....verified.txt":
image

Minimal Repro

        [Fact]
        public Task Test()
        {
            return Verifier.Verify("boo");
        }

Submit a PR that fixes the bug

If you point me to the source code I may be able to fix it.

@SimonCropp
Copy link
Member

does this look better VerifyTests/DiffEngine@9cf1d1b ?

@SimonCropp
Copy link
Member

thanks for you help. this is now deployed (pending a nuget cache update)

@RussKie
Copy link
Author

RussKie commented Jun 3, 2021

Thank you for the awesomely quick turnaround!

@SimonCropp
Copy link
Member

no worries. as a aside, is the codebase you using this an OSS project?

@RussKie
Copy link
Author

RussKie commented Jun 3, 2021

@SimonCropp
Copy link
Member

cool. what branch?

@RussKie
Copy link
Author

RussKie commented Jun 3, 2021

dotnet/winforms#5035

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

No branches or pull requests

2 participants