335891 - discrepancy in addBookmark2.js between trunk and 1.8 branch

Status: RESOLVED FIXED

(Firefox :: Bookmarks & History, defect)

Description

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

There's a discrepancy in addBookmark2.js between the trunk and the 1.8 branch.  Revision 1.38 of that file, which backs out feedview on the trunk (bug 305134), contains a change that revision 1.36.2.1, which backs out feedview on the branch, does not contain, so the two are no longer in sync.

Comment 1

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

Attachment: patch: syncs branch with trunk

Here's a simple patch that syncs the branch with the trunk.

Comment 2

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

Thanks Brett.  Fix checked in to branch:

Checking in browser/components/bookmarks/content/addBookmark2.js;
/cvsroot/mozilla/browser/components/bookmarks/content/addBookmark2.js,v  <--  addBookmark2.js
new revision: 1.36.2.4; previous revision: 1.36.2.3
done