INTEGRATION: CWS cvsprot01 (1.24.32); FILE MERGED

2007/08/23 15:17:02 hr 1.24.32.27: #i63544#: check for empty filelist before removing files
2007/08/16 15:33:27 hr 1.24.32.26: #i63544#: implement merge step with complete modules checkouts
2007/07/11 13:39:51 hr 1.24.32.25: #i63544#: merge_files(): special cases for wntmscixx files
2007/07/10 12:55:40 hr 1.24.32.24: #i63544#: merge_files(): handle 'Needs Checkout' case
2007/07/09 18:29:39 hr 1.24.32.23: #i63544#: handle the fact that if a file is removed in a CWS not all status lines are available
2007/07/06 14:04:34 hr 1.24.32.22: #i63544#: handle single file resyncs
2007/07/05 13:44:40 hr 1.24.32.21: RESYNC: (1.24-1.30); FILE MERGED
2007/07/04 17:27:38 hr 1.24.32.20: #i63544#: handle conflict files
2007/07/04 16:43:00 hr 1.24.32.19: #i63544#: handle conflict files
2007/07/04 16:32:20 hr 1.24.32.18: RESYNC: (1.24-1.30); FILE MERGED
2007/07/04 14:35:41 hr 1.24.32.17: #i63544#: fix handling of 'removed on MWS' files
2007/07/03 16:24:37 hr 1.24.32.16: #i63544#: undo merge errors
2007/07/03 15:50:56 hr 1.24.32.15: RESYNC: (1.24-1.30); FILE MERGED
Old methods will no longer work
2007/07/03 15:47:05 hr 1.24.32.14: #i63544#: fixes to commit_files()
2007/07/03 15:42:47 hr 1.24.32.13: RESYNC: (1.24-1.30); FILE MERGED
2007/06/25 17:07:32 hr 1.24.32.12: #i63544#: fixes to commit_files()
2007/06/25 16:39:07 hr 1.24.32.11: #i63544#: fixes to commit_files()
2007/06/25 15:58:42 hr 1.24.32.10: #i63544#: fixes to commit_files()
2007/06/22 16:07:52 hr 1.24.32.9: #i63544#: fixes for cases where the merge difference is already contained in a file
2007/06/13 12:27:54 hr 1.24.32.8: #i63544#: adapt to cvs 1.11.2 and newer
2006/08/23 15:38:48 hr 1.24.32.7: #i63544#: commit_files()
2006/08/23 15:22:43 hr 1.24.32.6: #i63544#: commit_files()
2006/07/06 17:09:53 hr 1.24.32.5: #i63544#: commit_files()
2006/06/29 18:04:04 hr 1.24.32.4: #i63544#: fixes to merge_files()
2006/06/28 18:09:15 hr 1.24.32.3: ##i63544#: fixes to merge_files()
2006/06/14 15:25:53 hr 1.24.32.2: #i63544#: implement merge_files()
2006/06/13 16:06:14 hr 1.24.32.1: #i63544#: first stab at adapting cwsresync to PCVSLib