[Bug 252054] mergemaster(8) regression after transitioning from svn to git

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054

            Bug ID: 252054
           Summary: mergemaster(8) regression after transitioning from svn
                    to git
           Product: Base System
           Version: Unspecified
          Hardware: Any
                OS: Any
            Status: New
          Severity: Affects Some People
          Priority: ---
         Component: conf
          Assignee: bugs at FreeBSD.org
          Reporter: zarychtam at plan-b.pwste.edu.pl

Created attachment 220823
  --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=220823&action=edit
mergemaster run with -F  still prompting to update the same file

mergemaster(8) has -F option which allows you to merge the files if the file
header has updated or changed. Git doesn't do ident tag expansion so in file
header you have now only $FreeBSD$. When both -FU options are used, mergemaster
prompts only to merge when the header is different. When the header is in svn
style, after updating the ident tag mergemaster doesn't ask again for updating
the same file in second and subsequent runs. The transition to git has broken
this feature and mergemaster prompts for the merge or update also in second and
subsequent runs. Please compare the attached script.

-- 
You are receiving this mail because:
You are the assignee for the bug.