> Hmmm...when I run merge it tells me: > > [duboff at eagle uts]$ hg merge > abort: untracked file in working directory differs from file in requested > revision: 'usr/src/pkgdefs/SUNWiscsitgtr/depend'
I didn't watch closely enough in your first note. This means exactly what it says. The file "usr/src/pkgdefs/SUNWiscsitgtr/depend" was previously NOT a version-controlled file, but now it is. But because it was a build target (copied over from usr/src/pkgdefs/common_files/depend), it exists in your workspace. Just rm that file and try again. --Mark
