I'm no CVS expert, but in my thinking, the easiest thing to do would be to merge the branch into the trunk at the last point before the files where renamed. Then rename the files and split off a new branch.
If you've already renamed the files on the trunk, I'd still do the same thing: 1) Retroactively, merge the branch into the trunk at the last point before the files were renamed 2) Split off a new branch just after the files on the trunk were renamed. 3) Merge the tip of the trunk into the new branch. As I said though, I'm no CVS guru, so I'd wait for someone else to confirm this is a good idea before trying it. (Or at least backup before trying it.) Wade On Friday, February 8, 2002, at 09:01 AM, Heirler Stefan wrote: > hi, > > -we develop a new product line on the main trunk > -on a branch the old product line is maintained > -due to new naming conventions we have to rename some files in the main > trunk > -from time to time we have to merge bugfixes from the branch to the main > trunk > -merging a renamed file is not possible > > is there any workaround to treat this problem? > > thanks > > stefan > > _______________________________________________ > Info-cvs mailing list > [EMAIL PROTECTED] > http://mail.gnu.org/mailman/listinfo/info-cvs > _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
