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 email@example.com.
Hi there! I tried again to merge a file added in the HEAD to a branch and EUREKA! It works! I think that the previous time the problem was that to merge I used the command cvs update -jHEAD SINGLE-file-name But as the file was absent in the branch this command simply cheked-out the file in a strange way (due to the -jHEAD option I think). This time I've done: cvs update -rBRANCH -jHEAD SINGLE-file-name and then commited the file and every thing has gone smooth. Bye! Problem merging file added on HEAD into a branch Gerhard Fiedler lists at connectionbrazil.com Fri Jul 20 18:18:05 BST 2007 * Previous message: [cvsnt] what is the command to find the list of the files changed in a check-in * Next message: [cvsnt] Can't init repository * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] Bartolomeo Nicolotti wrote: >> Not sure, but what happens when you now update the branch? Does it stay >> or does it go away? If it stays, the merge somehow already marked the >> file as now being on the branch, without an actual commit on the >> branch. > Yes, I think you're right! Here's the log for the added file: I think I was wrong. The merge does add such files automatically, but a commit is still necessary. See also <http://www.cvsnt.org/manual/html/Merging-adds-and-removals.html>. So I can't explain your results. Gerhard -- Bartolomeo Nicolotti SIAP Sistemi Applicativi s.r.l.