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.
I am attaching a file detailing what I am seeing, thanks. -----Original Message----- From: Tony Hoyle [mailto:tmh at nodomain.org] Sent: Tuesday, September 07, 2004 2:40 PM To: cvsnt at cvsnt.org cvsnt downloads at march-hare.com @CVSNT on Twitter CVSNT on Facebook Subject: Re: [cvsnt] Re: Merging a repository from Branch to Trunk Herb Croken wrote: > Ok, maybe I am doing something wrong. > Here is what I tried: > cvs upd -A -C > cvs -j'branchname' -jHEAD > Nothing happened, so I did A lot will have happened, unless there is no difference between the branch and HEAD. > cvs upd -jHEAD -j'branchname' That just reversed the process. > Lots happened :) but > cvs ci -m "message" failed with loads of conflicts You shouldn't get conflicts on a two-revision -j (assuming the files are unmodified, which should be true after the first command). Tony _______________________________________________ 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 -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: merge_conflicts.txt Url: http://www.cvsnt.org/pipermail/cvsnt/attachments/20040907/3842db20/attachment.txt