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 firstname.lastname@example.org.
Hello Eric, May be I'm a bit old-fashioned. I'm working with CVSNT 2.5.03 build 2382. This is what would work for me: 1. do the merge & commit in the trunk. 2. duplicate the resulting source in the trunk and rename it. 3. add & commit the new source in the trunk. 4. remove the old source. The only disadvantage of this procedure is the loss of revision history. But if the need to rename is that big, I wouldn't bother. Success! Frederik Krooshof. Software engineer Raet| T +31(0)33 4506739 F +31(0)33 4506482 Postbus 1495, 3800 BL Amersfoort Plotterweg 38, 3821 BB Amersfoort The Netherlands www.raet.nl -----Original Message----- From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf Of Eric B. Sent: woensdag 6 februari 2008 18:07 To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: Re: [cvsnt] Rename in branch causing merge issues > > 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? Thanks, Eric _______________________________________________ cvsnt mailing list cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt https://www.march-hare.com/cvspro/en.asp#downcvs ---- De inhoud van dit bericht en de eventueel daarbij behorende bijlagen zijn persoonlijk gericht aan en derhalve uitsluitend bestemd voor de geadresseerde. De ontvanger die niet de geadresseerde is, noch bevoegd is dit bericht namens geadresseerde te ontvangen, wordt verzocht de afzender onmiddellijk op de hoogte te stellen van de ontvangst. Elk gebruik van de inhoud van dit bericht en/of van de daarbij behorende bijlagen door een ander dan de geadresseerde is onrechtmatig jegens de afzender. The content of this communication and any attachments are of a confidential nature and accordingly intended only to be read by the addressee. If anyone receives this communication who is not the addressee and is not authorised by the addressee to receive such communication then such person is requested to notify the sender immediately. Any use of the content of this communication or any attachments by anyone other than the addressee constitutes an unlawful act. ----