[cvsnt] Rename in branch causing merge issues

Eric B. ebenze at hotmail.com
Wed Feb 6 17:06:46 GMT 2008

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.

> > I have renamed some files in a branch using cvs rename and
> > committed them
> > properly (commit the directory) as per the documentation.
> > Everythign works
> > great as long as I remain within the branch.  However, when I
> > try to merge
> > the branch back into the trunk, the renamed files aren't
> > merging.  I had
> > been expecting the renamed files to replace the trunk files, but that
> > doesn't seem to be the case.
> Merge will not 're-perform' renames - a merge acts on file contents not
> file names.

Ok - how do I need to handle this then in order not to break everything?  Do 
I need to first rename the files in my HEAD, commit the rename then perform 
the merge?



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook