Re: merging from HEAD into a branch?

[Todd Denniston]

Jean-Christian Imbeault wrote:
> 
> $ cvs -nq update -d -jHEAD
> RCS file: /repos/MRW/mizuhoApp/src/com/mizuho/rws/build.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> Merging differences between 1.1 and 1.2 into build.xml
> cvs update: build.xml: No such file or directory

Aldo TENDRON wrote:
> 
> > The -n options means "don't really do it"
> 
> Yes, "cvs -n up" doesn't checkout the file, the error message may comes
> from the merging step ?
> 

perhaps the problem is actually that cvs having the -n option, CVS should not
attempt to do a merge with files it did not actually checkout. CVS did not
checkout the files because the -n option was passed.

My suggestion, if it really bothers you and if you are either up to coding it
or getting someone else to, is find where cvs prints "Merging differences
between %?? and %?? into %s" and put that line and the lines that call the
merge functions into an 
if ((global -n option was passed) == true)
 {
  print(
   "%s Merging differences between %?? and %?? into %s, %s", 
   "normally I would be",
   rev1, rev2, filename,
   "but you passed the -n option.") ;
 }
else
 {
  original print and merge commands
 }

Update the sanity check so the old version fails the test and new version
passes the test.
Then send the patch file back to the list. :)
-- 
Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane) 
Harnessing the Power of Technology for the Warfighter