How to unbranch a file?

[Doug Lee]

Please forgive me if I'm missing something obvious...

I have a file that was humming along on the main trunk but suddenly
needed a branch quite a ways back.  I created the branch and committed
a few revisions, then some time later figure out how to get the trunk
version to work in the branch; so I committed a big revision in which
I made the branch copy identical to the trunk copy.  Now I'm revising
the trunk copy and want the branch copy to keep up automatically.  Can
this be done, or do I have to keep committing the updates in both
places separately?


-- 
Doug Lee           address@hidden        http://www.dlee.org
Bartimaeus Group   address@hidden   http://www.bartsite.com
In laughter, love is found; but in tears, it is forged.  (12/09/01)