95759 - localconfig.js contains strings of equals signs (===)

Status: RESOLVED FIXED

(Bugzilla :: Bugzilla-General, defect, P2)

Description

[Myk Melez [:myk] [@mykmelez]]

localconfig.js contains strings of equals signs (===), which can be
misinterpreted as indicators of a conflict in the file when using grep to find
files with conflicts in them.  Recommendation: use a different character to
underline section headers.

Comment 1

[Andreas Franke (gone)]

Workaround: grep for '<<<' instead of '==='.

Comment 2

[Dave Miller [:justdave]]

We are currently trying to wrap up Bugzilla 2.16.  We are now close enough to
release time that anything that wasn't already ranked at P1 isn't going to make
the cut.  Thus this is being retargetted at 2.18.  If you strongly disagree with
this retargetting, please comment, however, be aware that we only have about 2
weeks left to review and test anything at this point, and we intend to devote
this time to the remaining bugs that were designated as release blockers.

Comment 3

[Vlad Dascalu]

Attachment: Replaces "=" with "-" when used as a marker.

Proposed patch.

Comment 4

[Dave Miller [:justdave]]

I'm kind of ambivalent on this one.  ===== is used for all sorts of things.  I
always use <<<< to look for conflicts.

Although you hit that in BugMail.pm with the Perl format strings for the mail
diffs :)

Comment 5

[Christian Reis]

Comment on attachment 127919 [details] [diff] [review]
Replaces "=" with "-" when used as a marker.

r=kiko, cool

Comment 6

[Vlad Dascalu]

<-- me (patch writer)

Comment 7

[Dave Miller [:justdave]]

ok, why not.  It's just comments anyway, it won't hurt anything.

Comment 8

[J. Paul Reed [:preed]]

Checking in localconfig.js;
/cvsroot/mozilla/webtools/bugzilla/localconfig.js,v  <--  localconfig.js
new revision: 1.2; previous revision: 1.1
done

Comment 9

[Vlad Dascalu]

Thanks, jp, marking as fixed.