[Bug 9977] New: OMNIBUS, remove accidental 'merge marker' strings from Koha
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9977 Bug ID: 9977 Summary: OMNIBUS, remove accidental 'merge marker' strings from Koha Classification: Unclassified Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: NEW Severity: normal Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: gmcharlt@gmail.com Reporter: mtj@kohaaloha.com some files have accidental merge marker strings in them ie: '<<<<<<<<<<<<<<', '>>>>>>>>>>>>>>>>' and '================' we should remove these lines, to increase our ability to detect actual merge errors -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9977 --- Comment #1 from Mason James <mtj@kohaaloha.com> --- here's 2 examples... kohaclone/authorities/authorities.pl: 535 # ======================== 536 # MAIN 537: #========================= 538 my $input = new CGI; 539 my $z3950 = $input->param('z3950'); kohaclone/cataloguing/addbiblio.pl: 714 # ======================== 715 # MAIN 716: #========================= 717 my $input = new CGI; 718 my $error = $input->param('error'); -- You are receiving this mail because: You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9977 Galen Charlton <gmcharlt@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #2 from Galen Charlton <gmcharlt@gmail.com> --- '<<<<' or '>>>>' isn't the pattern to look for. What you want is '^<<<<<' and '^>>>>>'. Fortunately, there is already a test for this: t/00-merge-conflict-markers.t. In principle, one could also look for '^=====', but there are a bunch of files that do that legitimately (e.g., the release notes). Since this issue is already handled, in other words, I'm marking this resolved/invalid. -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org