Lesson learned the hard way...If you're going to make a branch into /tmp, it is STRONGLY ADVISED to cp an ***UNMODIFIED /trunk*** (i.e., do not have any local edits on the /trunk that you're copying). Then make/apply all your changes in a new checkout of your /tmp tree and go from there.
This will make it SIGNIFICANTLY easier to merge your /tmp branch back into the trunk when you're done.
Just FYI.
--
{+} Jeff Squyres
{+} The Open MPI Project
{+} http://www.open-mpi.org/
