[cvsnt] Rename in branch causing merge issues

Gerhard Fiedler lists at connectionbrazil.com
Mon Feb 4 12:15:18 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.

Arthur Barrett wrote:

> Does anyone know what the default merge actions on renamed files are for
> other systems, eg: ClearCase, PVCS, SVN etc?  If you rename a.txt to
> b.txt on branch and then merge to trunk does a.txt on trunk get the
> changes or is a.txt on trunk renamed?

I can't imagine that it makes sense not to rename. This would pretty much
break any build. When you rename a file, you generally also change some
makefile or other project file. 

When you then merge these changes from one branch into another, the
contents of the makefile or project file get properly merged. In order for
the project to continue to build, the rename of the files needs to be
merged, so... 

How/when could it make sense to merge a makefile but not merge the file
name changes that are reflected in the makefile?


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