vendor drop question

I have a subversion repository set up with a vendor drop. I am
wondering if there is an easy way to handle the following situation:

* I have done the latest vendor drop and have merged it with our
  local mods.
* It is then decided that we would like to go back temporarily to the
  vendor drop from say 2 versions ago, but with our current locals
  mods still there.
* First assume that their are no conflicts, moves, renames, deletes,
  etc. - everything would just neatly drop into place. Is there a
  straightforward way to do this?
* What if it were more complicated - with conflicts, moves, renames,
  deletes, etc. - would subversion still be able to help me do this?
  For instance, could I roll back to two versions ago, and have
  subversion tell me what changed locally since then, and put these
  differences back in? Some automatically? Some manually?
* Then once we decide to go with the newest vendor drop again, do I
  remerge it or can I somehow pull it out of the history I already
  have?

Thanks,
John

-- 
John R. Tannahill
Lawrence Livermore Nat. Lab
P.O. Box 808, M/S L-103
Livermore, CA  94551
Phone:  925-423-3514
Email:  tannahill1_at_llnl.gov
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2356623
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].