I've finished the resync. The technique I decided to use was:
1. Sync up with build 103 (using the hg tags)
2. Pull build 103 into a new repo (clearview-noipmp-new)
3. Copy all of the source files from clearview-noipmp into
clearview-noipmp-new.
4. Do an "hg commit" in clearview-noipmp-new to capture all the noipmp
changes as a single changeset.
5. Repeat for usr/closed.
6. Pull clearview-noipmp into a new repo (clearview-ipmp-new)
7. Do the same dance as 3-5, except with clearview-ipmp-new.
Of course, I was careful to check that the list of changed files was the
same, the list of changesets contributed from Nevada was the same, and
other similar checks. The source files are (by definition) identical;
only the metadata has changed.
I've already renamed the *-new repos above to clearview-noipmp and
clearview-ipmp; the old repos are at:
/export/ws/clearview/gate-cemetery/clearview-{ipmp,noipmp}-ipobs
Erik: just in case build 103 is a useful reference point for you, I will
not pull any new changes from Nevada into these repos until I hear you're
reparented to them and things look good. Of course, I will continue to
fix Clearview IPMP issues, which will create some new changesets.
--
meem
