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
-----Forwarded Message-----
From: Stephen Davidson <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED], Philip Brown <[EMAIL PROTECTED]>
Subject: Re: [Fwd: [Keelgroup] e: RFE 817315 - Uploaded files have their
original Field Names dropped]
Date: Mon, 20 Oct 2003 11:43:57 -0500
Philip J Brown wrote:
> Santanu,
>
> I'm not sure exactly what Steve means by his post,
> but would you look at his changes and see if they are appropriate for us
> to make in the 1.0 branch as well.
>
> Steve,
> Could you shed some light and share the changes with us if need be?
>
> Thanks.
>
> -Phil
> -----Forwarded Message-----
>
> From: Stephen Davidson <
My apologies for the lengthy delay. I have been unexpectedly relocating, and was
actually offline when this email was sent.
Basically, what I did was to embed the Field Name from the HTML Form in the Key name.
This allows for other Models to do Post Upload processing on files after they have
been transferred.
Now, question: Santanu - Why did you clobber theseand other changes from HEAD?
This includes the XDoclet & Enhanced Logging additions?
FYI: I have found a NullPointerException condition in line 105 of version 1.5, dealing
with unrecognized MimeTypes. I have fixed it in my code, but the only way for me to
check it in is to clobber Santanu's latest check in.
Regards,
Steve
http://keelframework.org/documentation
Keelgroup mailing list
[EMAIL PROTECTED]
http://lists.keelframework.com/listinfo.cgi/keelgroup-keelframework.com
