I have an RTI approved for the fix to make wx2hg do this correctly. --Mark
On Wed, 30 Jul 2008, Gavin Maltby wrote: > Date: Wed, 30 Jul 2008 21:44:33 +1000 > From: Gavin Maltby <Gavin.Maltby at Sun.COM> > To: scm-migration-dev at opensolaris.org > Subject: [scm-migration-dev] wx2hg and usr/closed > > Hi, > > Is wx2hg expected to handle migrating Teamware workspaces that include changes > in both the usr/src and usr/closed trees? I just tried wx2hg on such a > workspace > and it failed as follows: > > (gavinm at hyper:/tank/scratch/gavinm/on-fx-hg )-> wx2hg -u -r onnv_95 > /tank/scratch/gavinm/on-fx-merge > > Doing out check: > Teamware parent /ws/onnv-clone has an hg twin > Cloning ssh://elpaso.eng//export/clone-hg > to /tank/scratch/gavinm/on-fx-merge-hg > + hg clone -r onnv_95 ssh://elpaso.eng//export/clone-hg > /tank/scratch/gavinm/on-fx-merge-hg > requesting all changes > adding changesets > adding manifests > adding file changes > added 7153 changesets with 97711 changes to 50605 files > updating working directory > 45608 files updated, 0 files merged, 0 files removed, 0 files unresolved > Cloning from ssh://elpaso.eng//export/clone-hg/usr/closed > to /tank/scratch/gavinm/on-fx-merge-hg/usr/closed > requesting all changes > adding changesets > adding manifests > adding file changes > added 924 changesets with 8007 changes to 4384 files > updating working directory > 3160 files updated, 0 files merged, 0 files removed, 0 files unresolved > rename usr/closed/uts/i86pc/io/memtest/memtest.conf -> > usr/closed/uts/intel/io/memtest/memtest.conf > + hg mv usr/closed/uts/i86pc/io/memtest/memtest.conf > usr/closed/uts/intel/io/memtest/memtest.conf > abort: path 'usr/closed/uts/i86pc/io/memtest/memtest.conf' is inside repo > 'usr/closed' > + fail rename failed. > wx2hg: rename failed. > Please run > hg --cwd /tank/scratch/gavinm/on-fx-merge-hg update -C > before retrying. > > It was kind enough to clone both open and closed repos, but fell at the > first hurdle after that. > > I was half expecting to migrate this project manually, but I just wanted to > check > I'm not missing any tricks first. We have 32 renames - 26 within usr/src and > 6 within usr/closed, 0 moving between open and closed trees (thankfully), and > 0 removals. > > Thanks > > Gavin > _______________________________________________ > scm-migration-dev mailing list > scm-migration-dev at opensolaris.org > http://mail.opensolaris.org/mailman/listinfo/scm-migration-dev >