Re: repeated merges from a branch

2002-12-11 Thread david
> I have reached the point where I need to merge from a branch to main a second > time with the same file. The documentation I have found dedicates just enough > words to say use "cvs checkout -j once -j twice file" and it's the human's > responsibility to guess the right value for "once". This s

repeated merges from a branch

2002-12-10 Thread CHARLES HART, BLOOMBERG/ 499 PARK
I have reached the point where I need to merge from a branch to main a second time with the same file. The documentation I have found dedicates just enough words to say use "cvs checkout -j once -j twice file" and it's the human's responsibility to guess the right value for "once". This strikes m