I removed and did a clean checkout of the module, cvs checkout arrow (in directory C:\projects) cvs server: cwd=/tmp/cvs-serv15957 ,current=/tmp/cvs-serv15957 cvs server: Updating arrow then: cvs upd -jB-T-20030812 -jHEAD On the console, I only see one file as being updated U images/but_continue.gif Then I removed and did a clean checkout of the module again, cvs checkout arrow (in directory C:\projects) cvs server: cwd=/tmp/cvs-serv15965 ,current=/tmp/cvs-serv15965 cvs server: Updating arrow then reversed the branch and HEAD: cvs upd -jHEAD -jB-T-20030812 On the console, I see: 1. -lots of merges: RCS file: /cvsrepo/arrow/src/com/PrintProcess.java,v retrieving revision 1.6 retrieving revision 1.6.4.1 Merging differences between 1.6 and 1.6.4.1 into PrintProcess.java 2. -lots of new files added to HEAD, files that were in added in the branch: cvs server: Updating src/com/moto U src/com/moto/MotoPolicyModel.java U src/com/moto/MotoValidator.java U src/com/moto/MotorcycleUtils.java 3. -lots of conflicts RCS file: /cvsrepo/arrow/src/com/arrow/FormProcessor.java,v retrieving revision 1.24 retrieving revision 1.24.2.5 Merging differences between 1.24 and 1.24.2.5 into FormProcessor.java rcsmerge: warning: conflicts during merge C src/com/arrow/FormProcessor.java -every file that I checked had a similar conflict, with the author and the version: <<<<<<< FormProcessor.java * @version $Revision: 1.24 $ $Date: 2003/08/06 21:10:14 $ * @author $Author: gb $ ======= * @version 2 * @author xl >>>>>>> 1.24.2.5