> I was asked to inform this email list that the wx2hg script doesn't work in > cases where changes have been made between the final Teamware gate and the > Mercurial gate. > > A workaround I recommend (and did work) is to use the tar command to copy the > files from the teamware gate to the Mercurial gate. The issue is moot with > me since I'm using this workaround successfully. > > Anyway I tried this command (after reparenting the Teamware gate to > /net/onnv.sfbay/export/onnv-tw-gate): > /opt/onbld/bin/wx2hg -t /builds/da73024/nv96_bswap_hg > /builds/da73024/nv96_bswap_tw > > It gave an error because the parent Teamware gate isn't synced with the > parent Mercurial gate. This, of course, will always be true going forward, > so wx2hg will never work (unless the Teamware gate resyncing is resumed). > Specifically, there was an error with usr/src/lib/libc/amd64/gen/byteorder.s, > where, around line 26/28 this line in the final Teamware gate: > .file "%M%" > was changed to this line in the current Mercuial gate: > .file "byteorder.s"
The Teamware workspace /net/onnv.sfbay/export/onnv-tw-clone has specifed a Mercurial twin workspace of ssh://onnv.sfbay//export/clone-hg. That Mercurial workspace has not been, and will not be, updated beyond onnv_96. They should always be in sync. If you are using -t to convert your teamware workspace into an existing Mercurial workspace, you must use -r onnv_96 to prevent the problem you're seeing. --Mark > Unfortunately, my workspace changes file byteorder.s, so there's an > irresolvable conflict preventing my use of wx2hg. > > P.S., I know that SCCS keywords need to be deleted--I did that, but in any > case that's NOT the issue here. > > - Dan > >
