We'd like to have 4 header files below security/nss/lib moved around. There is a move script already attached to bug 463342 attachment 346599 [details] (pending review). I will add another comment to this bug once the move script gets fomally reviewed (I already have review on the plan in bug 433062 comment 40.)

fixing dependency list

move script got reviewed, this bug is ready for action thanks in advance for your work

There's a conflict on this move. security/nss/lib/softoken/Attic/pk11init.h,v already exists security/nss/lib/softoken/Attic/secmodt.h,v already exists > RCS file: security/nss/lib/softoken/Attic/pk11init.h,v > head: 1.1 > branch: > locks: strict > access list: > symbolic names: > STAN_WORK_BRANCH: 1.1.0.2 > keyword substitution: kv > total revisions: 2; selected revisions: 2 > description: > ---------------------------- > revision 1.1 > date: 2003/02/11 22:10:56; author: ian.mcgreer%sun.com; state: dead; > branches: 1.1.2; > file pk11init.h was initially added on branch STAN_WORK_BRANCH. > ---------------------------- > revision 1.1.2.1 > date: 2003/02/11 22:10:56; author: ian.mcgreer%sun.com; state: Exp; lines: +52 -0 > remove old files, move softoken dependencies inside softoken > ============================================================================= > RCS file: security/nss/lib/softoken/Attic/secmodt.h,v > head: 1.1 > branch: > locks: strict > access list: > symbolic names: > STAN_WORK_BRANCH: 1.1.0.2 > keyword substitution: kv > total revisions: 2; selected revisions: 2 > description: > ---------------------------- > revision 1.1 > date: 2003/02/11 22:10:56; author: ian.mcgreer%sun.com; state: dead; > branches: 1.1.2; > file secmodt.h was initially added on branch STAN_WORK_BRANCH. > ---------------------------- > revision 1.1.2.1 > date: 2003/02/11 22:10:56; author: ian.mcgreer%sun.com; state: Exp; lines: +264 -0 > remove old files, move softoken dependencies inside softoken > ============================================================================= There's two options: 1) cvs add those two files on the trunk with the current code and forget about the history -or- 2) Move the file on trunk with history intact, and obliterate it off the other branch, history and all

or 3) if the file happens to match the state of that file on the trunk at the timestamp it was moved, it could be obliterated off the branch, current file moved into place with history, and then the revision in question re-tagged for the branch. Although this might be tricky if someone pulls that branch by date because of the way our copy scripts deal with checkin dates. Then again, how likely is it anyone will ever touch that branch again? Probably option 2 is what I'd go with, or option 3 and forget about making checkouts-by-date work within that branch.

Option 2 is acceptable. I discussed this issue with Nelson and we agree that Option 2 is acceptable. STAN_WORK_BRANCH is from 2003 and was used by Ian Mcgreer who is no longer an active NSS contributor.

I concur, Dave, is there anything else you need from us?

(In reply to comment #6) > anything else you need from us? Nope. Apologies on not having it done sooner, I apparently missed the bugmail with Glen's answer. Should have this taken care of later tonight.

All set, sorry for the delay.