[ https://issues.apache.org/jira/browse/SCM-735?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17962779#comment-17962779 ]
ASF GitHub Bot commented on SCM-735: ------------------------------------ jira-importer commented on issue #941: URL: https://github.com/apache/maven-scm/issues/941#issuecomment-2964634439 **[Todd Currie](https://issues.apache.org/jira/secure/ViewProfile.jspa?name=tcurrie)** commented This patch should be adjusted to take into account SCM-745. The regular expression should not make use of the greedy wild card match, otherwise the author name can become corrupted depending on the text of the change description. From the attached patch: @@ -36,7 +36,7 @@ public class PerforceFilelogConsumer { private static final String PERFORCE_TIMESTAMP_PATTERN = "yyyy/MM/dd"; - private static final String LINE_PATTERN = "#(\\d+).**on (.**) by (.*)@"; + private static final String LINE_PATTERN = "#(\\d+) change (\\d+) .* on (.**) by (.**)@"; Should be: @@ -36,7 +36,7 @@ public class PerforceFilelogConsumer { private static final String PERFORCE_TIMESTAMP_PATTERN = "yyyy/MM/dd"; - private static final String LINE_PATTERN = "#(\\d+).**on (.**) by (.*)@"; + private static final String LINE_PATTERN = "#(\\d+) change (\\d+) .**? on (.**?) by (.*?)@"; > Blame result on branched file is incorrect > ------------------------------------------ > > Key: SCM-735 > URL: https://issues.apache.org/jira/browse/SCM-735 > Project: Maven SCM (Moved to GitHub Issues) > Issue Type: Bug > Components: maven-scm-provider-perforce > Affects Versions: 1.8.1 > Reporter: Gregory SSI-YAN-KAI > Priority: Major > Attachments: blame_result_fix.patch, scm.patch > > > When a file is branched, its revision id restarts from 1. > So, 2 different lines can have the same revision id even though they have > been submitted in 2 different changelists. > Since the perforce blame command is based on the revision id of each line, > the result might be incorrect. > The solution I'm proposing in the attached patch is to use changelist number > to identify the author of a line. -- This message was sent by Atlassian Jira (v8.20.10#820010)