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 sales@march-hare.com.
Daniel Lapolla wrote: > Imagine that developer 1, working on CR 12345 creates the branch > br_cr_12345 on files A and B, and adds C directly in that branch. > > CR 12345 goes through testing and the tests fail. > > But Developer 1 is sick and Developer 2 must carry on the work on cr > 12345. So the first step in order to developer 2 make the necessary > corrections in CR 12345 is to retrieve br_cr_12345. > > The procedure I stated in my initial post is what Developer 2 used to do > to retrieve the cr. > That works fine for me (and others presumably) and is exactly what I do to merge branches. I can only imagine you're doing something different to the normal merge sequence - normally it'd be cvs up -A cvs up -j branch Tony