> > One way to avoid these problems is by specifying revisions manually: > > CVS update -j <revision1> -j <revision2> <filename(s)> > > This merges changes between the specified revisions to the current > > branch. > > Thanks this realy helps a lot. > > If it's me you have something againts just say it. but I think you have > been quite a pain in the *ss lately.
Sorry .. maybe i should always wait for a hour or so.. before sending email.. I think your comments are valid. But on the other hand I don't feel it realy helps. can you explain a bit more on how to know to find out what revision to use and such? I know that just doing a "full" merge is not always the best. for example if you have added methods in head and mergde them into de branch that might give errors. anyway.. I am realy trying to help. and realy want everybody to work together on a better "cloud".
