Up to a point, Eclipse/CVS diff works.
In this case, I had 50+ lines of code changed (added - mostly debug statements, but the code for this RFE as well) against 3 lines from Santanu. And against that many diffs, the Eclise/CVS tools get very confused and don't work very well.
Santanu's check in had clobbered all those additions. The debug code is controlled from the logkit.conf file, btw. And the one that is checked in to CVS has the debug code turned off (unless I got careless). Feel free to "play" with that debugging code next time you guys are messing around in svc-fileupload-struts.
Btw, you are aware that there is now a 1.0 branch of svc-fileupload-struts, right?
Regards, Steve
Philip J Brown wrote:
Steve,
As an fyi, if you are using eclipse, then right-click on the project in "package explorer" from the java perspective and select "team --> Sychronize with repository..."
This menu choice bring up an interface showing all differences, and actually lets you double click a file to see, line by line, the difference and to handle merging any "conflicts" that have occurred.
The feature is very powerful and once you get the hang of it, you'll see that it provides and "outline" that summarizes what methods were added, deleted or changed in each version, has options to let you select changes one-by-one or to "merge all non-conflicting changes" with one click.
Once you've done some changes, right click in the file on the left and select "save" and viewer will update the differences.
When you have merged everything, save again and select the file from the top pane, right click and select "mark as merged". This will allow you to check the new "merged" version into CVS.
I hope this helps... it took me a while to get confortable with the interface and feel confident using it, but now that I've got the hang of it, it seems almost "simple".
-Phil
-- Java/J2EE Developer/Integrator Co-Chair, Dallas/FortWorth J2EE Sig 214-724-7741
http://keelframework.org/documentation Keelgroup mailing list [EMAIL PROTECTED] http://lists.keelframework.com/listinfo.cgi/keelgroup-keelframework.com
