Merge message parser does not work for merge commits created by TFS

[kelly987654]

TFS automatically prepends the PR# to the merge commit message, which prevents the Regex matches of merge commit messages to properly detect the base version.

For ex. if the PR title is 'Merge release/2.3.1 to master', the merge commit automatically created by TFS on completion of the PR is 'Merged PR 12345: Merge release/2.3.1 to master'

Expected version: 2.3.1+0
Actual version: 2.3.1+688

Removing the '^' at the beginning of the Regex expressions in MergeMessage.cs would fix the issue.

This issue appeared after updating to GitVersion 4, we did not have this issue in version 3.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. After 30 days from now, it will be closed if no further activity occurs. Thank you for your contributions.

[kelly987654]

Any thoughts on this? This issue prevents us from using the latest GitVersion, since we cannot control the merge commit message created by TFS.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. After 30 days from now, it will be closed if no further activity occurs. Thank you for your contributions.

[kelly987654]

Still hoping for a fix on this

[asbjornu]

I'd think #1488 should help fix this issue for you. Have you looked into configuring merge-message-formats? Now I just discovered that although #1488 provided documentation, that documentation doesn't seem to have been published on Read The Docs. Any idea why that might be, @arturcic?

[kelly987654]

Thanks @asbjornu! I will test it out.

[stale]

This issue has been automatically marked as stale because it has not had recent activity. After 30 days from now, it will be closed if no further activity occurs. Thank you for your contributions.

[asbjornu]

The documentation for merge-message-formats is now live on gitversion.net.

[kelly987654]

@asbjornu Thanks - I tried it exactly from the documentation, and it didn't work. I eventually got it working after adding quotes around the regex.

This failed due to an error parsing the YAML:

merge-message-formats:
    tfs: ^Merged (?:PR (?<PullRequestNumber>\d+)): Merge (?<SourceBranch>.+) to (?<TargetBranch>.+)

This worked:

merge-message-formats:
    tfs: '^Merged (?:PR (?<PullRequestNumber>\d+)): Merge (?<SourceBranch>.+) to (?<TargetBranch>.+)'