Eric.Saxe wrote: > Hi Aubrey, > > I notice there's a quite a few files that would seem unrelated to PAD > / hpet_pcplusmp (like the deleted_files, etc). Any ideas? > This is what I did:
1) hg clone -r onnv_97 onnv-gate pad-merge-gate 2) cd pad-merge-gate 3) pad-merge-gate> hg pull -u ../pad-gate 4) pad-merge-gate> hg pull -u ../hpet_pcplusmp 5) pad-merge-gate> hg merge 6) fix merge failed files 7) build and test 8) pad-merge-gate> hg commit 9) cd pad-gate 10) pad-gate> hg pull -u ../pad-merge-gate 11) pad-gate> hg push I didn't realize where is wrong. I'll take a look. When pad gate and hpet_pcplusmp said they are updated to b97, is the revision onnv_97(7367)? Thanks, -Aubrey
