173355 - Update mac desktop getinfo strings for 1.2b

Status: VERIFIED FIXED

(SeaMonkey :: Build Config, defect, P1)

Description

[Yumaris Calonje]

Update version strings to 1.2b for mozilla/xpfe/bootstrap/nsMacVersion.r and
mozilla/xpfe/bootstrap/mozilla.plst

Comment 1

[Aki Sasaki]

Attachment: update, with "Netscape 6" update

also, the .plst is still binary... wasn't it supposed to be ascii now?

Comment 2

[J.J. Enser]

it's text really, but one of the revisions was accidentally checked in as binary
, which added the sticky options -kb. All subsequent revisions are now
considered as binary and it seems like there's no way back.
cvs experts: Any chance to hack the file on the repository to get rid of the -kb
flag once and for all?

note: You can still edit the file and then diff it using diff -s

Comment 3

[Aki Sasaki]

yeah, it's in the patch.

Comment 4

[Daniel (Leaf) Nunes]

cvs admin -kkv mozilla.plst

removes the -kb option; you have to update local trees to remove the sticky
option locally (cvs update -A mozilla.plst).
(done, you need to be in the cvsadmin group to do cvs admin operations... you
can trick unix clients into giving you access by creating a local cvsadmin group)

Comment 5

[Daniel (Leaf) Nunes]

what's with the last diff line in the first patch of <a
href="http://bugzilla.mozilla.org/attachment.cgi?id=102279&action=view">102279</a>?

Looks like the same line, but maybe a different line ending?

Comment 6

[Aki Sasaki]

it specifies "netscape 6".  i removed the 6, unless we want it to say "another
version of mozilla or netscape 6 or 7."

Comment 7

[J.J. Enser]

Comment on attachment 102279 [details] [diff] [review]
update, with "Netscape 6" update

wow, looking at the mozilla.plst diff, it looks like the resource fork of the
file got added at the end of the data fork. That's the 4-5 lines that look like
binary data in the patch.
Make sure this doesn't get checked in!
(it's ok to loose resource fork that BBEdit created)

Comment 8

[Aki Sasaki]

Attachment: updated patch, removing binary garbage

still getting binary file in cvs diff... used -a to get the diff.

Comment 9

[J.J. Enser]

Comment on attachment 102616 [details] [diff] [review]
updated patch, removing binary garbage

Aki, if you haven't updated your tree since the -kb flags were removed, then
you need to do cvs update -A mozilla.plst.
Or, easier, trash your local copy and start over.

If you have problems, let's do this together to make sure the next revision is
checked in as expected and we don't drag this problem along any longer.

in your patch, it's not clear if the file starts with <?xml ...> or <!DOCTYPE
...>. It should be <?xml ...>

Comment 10

[Aki Sasaki]

asasaki@DEATHDUCK d:/trunk/mozilla/xpfe/bootstrap 566
$ mv mozilla.plst a
asasaki@DEATHDUCK d:/trunk/mozilla/xpfe/bootstrap 567
$ cvs up -A mozilla.plst
U mozilla.plst
asasaki@DEATHDUCK d:/trunk/mozilla/xpfe/bootstrap 568
$ echo " " >> mozilla.plst
asasaki@DEATHDUCK d:/trunk/mozilla/xpfe/bootstrap 569
$ cvs diff mozilla.plst
Index: mozilla.plst
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/mozilla.plst,v
retrieving revision 1.13
diff -r1.13 mozilla.plst
Binary files /tmp/cvsi5Fns_ and mozilla.plst differ

Comment 11

[Aki Sasaki]

Attachment: with <?xml line.

Comment 12

[Greg K.]

Did any of this break Chimera, causing bug 174125?

Comment 13

[J.J. Enser]

Comment on attachment 102618 [details] [diff] [review]
with <?xml line.

r=jj. applied this patch successfully.

Comment 14

[Daniel (Leaf) Nunes]

Comment on attachment 102618 [details] [diff] [review]
with <?xml line.

sr=leaf, a=blanket for revision changes.

Comment 15

[Aki Sasaki]

checked in.

Comment 16

[Tracy Walker [:tracy]]

verified