Re: Removing Files From HEAD and retaining them,

[Larry Jones]

Roger Ashby writes:
>
> Mime-Version: 1.0
> Content-Type: multipart/mixed; boundary="===============1527582503=="

Please do not send MIME and/or HTML encrypted messages to the list.
Plain text only, PLEASE!

> when I make changes to the HEAD 
> that I want to merge to all of the branches, those files are deleted from 
> the branches because they no longer reside in the HEAD which isn't what I 
> want. Does anyone know of anyway of doing this without letting the merge 
> delete the files in the branch, then and adding them as new files into the 
> branch.

If you're doing multiple merges of the trunk to the branchs, you must
have tags on the trunk indicating the last revision that was merged to
each branch.  Simply remove that tag from the deleted files that you
want to keep on the branch.

-Larry Jones

Hmph. -- Calvin