On Sat, Jan 02, 1999 at 11:38:18AM +0100, Robert M. Münch wrote:
Hi, but this works only of no filenames overlap. But I have the 'old' base
in depot A, creating a new depot B, checking in the base I have on my
workstation, alter it, and now I want to merge back the stuff I changed from
depot B to depot A. Of course I have the same filenames in both depots. Any
idea?
Why are you using a second depot to do this instead of a branch in the
original depot?
Sounds like you should just do the same thing you did before. Pull out
the latest version of your private stuff from depot B, and check it in
to depot A. You are going to lose your change history, but if you
wanted to keep it, you probably should have done this work on a branch
in the original depot.
---
David Jeske (N9LCA) + http://www.chat.net/~jeske/ + jeske at chat.net