Bug 9977 - OMNIBUS, remove accidental 'merge marker' strings from Koha
Summary: OMNIBUS, remove accidental 'merge marker' strings from Koha
Status: CLOSED INVALID
Alias: None
Product: Koha
Classification: Unclassified
Component: Architecture, internals, and plumbing (show other bugs)
Version: Main
Hardware: All All
: P5 - low normal (vote)
Assignee: Galen Charlton
QA Contact:
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-02 21:20 UTC by Mason James
Modified: 2014-12-07 20:03 UTC (History)
0 users

See Also:
Change sponsored?: ---
Patch complexity: ---
Documentation contact:
Documentation submission:
Text to go in the release notes:
Version(s) released in:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Mason James 2013-04-02 21:20:53 UTC
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
Comment 1 Mason James 2013-04-02 21:21:22 UTC
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');
Comment 2 Galen Charlton 2013-12-05 16:52:55 UTC
'<<<<' 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.