[Bug 5400] New: add test case to detect merge conflict markers in the code
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5400 Summary: add test case to detect merge conflict markers in the code Change sponsored?: --- Product: Koha Version: HEAD Platform: All OS/Version: All Status: NEW Severity: enhancement Priority: P5 Component: Architecture, internals, and plumbing AssignedTo: gmcharlt@gmail.com ReportedBy: gmcharlt@gmail.com QAContact: koha-bugs@lists.koha-community.org Estimated Hours: 0.0 Merge conflict markers don't belong in the code, of course, but occasionally can creep in during a moment of inattention. A test case can catch them. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5400 --- Comment #1 from Chris Nighswonger <cnighswonger@foundations.edu> 2010-11-18 03:15:39 UTC --- This bug has a patch presently committed to HEAD and 3.2.x. Please take the appropriate action to update the status of this bug. Remember, bugs which have been resolved should be tested and marked closed, preferably by the original reporter. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5400 Chris Nighswonger <cnighswonger@foundations.edu> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |cnighswonger@foundations.ed | |u --- Comment #2 from Chris Nighswonger <cnighswonger@foundations.edu> 2010-11-30 13:49:42 UTC --- This bug has a fix which was committed to the 3.2.x branch and released in 3.2.1. Please take time to update the status of this bug and mark it RESOLVED FIXED so that it may be closed. -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5400 --- Comment #3 from MJ Ray (software.coop) <mjr@ttllp.co.uk> 2010-12-08 10:15:53 UTC --- This bug is mentioned in: bug 5400: new test case to find files with merge conflict markers http://lists.koha-community.org/pipermail/koha-patches/2010-November/012969.... bug 5400: new test case to find files with merge conflict markers http://lists.koha-community.org/pipermail/koha-patches/2010-November/012993.... bug 5400: new test case to find files with merge conflict markers http://lists.koha-community.org/pipermail/koha-patches/2010-November/012994.... -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5400 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED CC| |katrin.fischer@bsz-bw.de Resolution|--- |FIXED -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5400 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|master |unspecified -- You are receiving this mail because: You are the QA Contact for the bug. You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org