David Stutzman wrote, On 2007-12-10 05:00: > I have recently run into a problem that appears to have been fixed 2 > weeks ago according to bugzilla: > https://bugzilla.mozilla.org/show_bug.cgi?id=239809 > > I'm curious how I check out a version of JSS that contains the fixes. > > Doing: "cvs status -v > mozilla/security/jss/org/mozilla/jss/pkcs7/EncryptedContentInfo.java" > doesn't show any tags that contain version 1.5 of the file that I'd like > to test.
I'm not sure that cvs status would show that. But in any case, if the fix is not yet incorporated into any static tag, then you'd need to pull from the trunk or branch tag to get the fix. That's somewhat risky, since you won't be pulling a QA'ed release, but if you really need that fix, then ... > MXR/LXR (what's the difference between those 2?) They're each broken in different ways. :-) > shows version 1.5 being on HEAD. So also does http://bonsai.mozilla.org/cvsgraph.cgi?file=mozilla/security/jss/org/mozilla/jss/pkcs7/EncryptedContentInfo.java You have to be careful with the special tag "HEAD". When you use it in a workarea (a.k.a. "sandbox") checked out from a branch, HEAD means the tip of the branch, not the tip of the trunk. There is no tag that ubiquitously and unambiguously always means "the tip of the trunk". It is possible to create a tag that always means that, but doing so creates a local convention, since such a tag is not a reserved CVS tag. > After doing cvs co mozilla/security/jss, I don't appear to > have the latest version of the file in question. If you do that in a workarea that is already checked out, cvs co behaves much like cvs update. If you create a new workarea with the cvs co command, it will pull the tip of the trunk. cvs update -A <filename> should also force it to update to the very tip of the trunk. If you find that you cannot get rev 1.5, even when checking out into a new workarea, then this suggests that the cvs mirror from which you are pulling the file has gotten out of sync with the master for this file. Sometimes, if you report a broken mirror for a file in #bmo, the sysops will fix it on the spot. At other times, they will tell you to file a bug against mozilla.org server operations. > I ended up just copy/pasting the new version into my source and > recompiling (now my p12 parses, yay!). I'm just glad the fix was > contained to one file in this case. > > Thanks, > Dave /Nelson _______________________________________________ dev-tech-crypto mailing list dev-tech-crypto@lists.mozilla.org https://lists.mozilla.org/listinfo/dev-tech-crypto