|
| Re: Synchronizing a project using CVS [message #120062 is a reply to message #119380] |
Mon, 24 November 2003 13:37   |
Eclipse User |
|
|
|
Originally posted by: bob.news.gmx.net
"Gerry Reno" <grenoml@yahoo.com> schrieb im Newsbeitrag
news:3FBE4D0D.2090103@yahoo.com...
> Right now I have Eclipse 2.1 and am testing 3.0M4. I've converted to
> using Eclipse for managing all my Jakarta projects. For instance I have
> checked-out the CVS version of jetspeed 1.4b4. I have deployed several
> portals based on 1.4b4 and of course the users of these production
> portals have been in and making their changes, personalizations, etc. I
> would now like to upgrade these portals to a later version of jetspeed
> that have some bugs fixed. I'm trying to figure out how the CVS
> capabilities in eclipse can help me do this in the simplest manner
> possible. If I synchronize with the HEAD of course I can pull in all
> the latest jetspeed changes and hopefully merge any conflicts locally
> for the basic jetspeed. I can then build, deploy and test the new
> version of our generated basic jetspeed war file. Great. But, is there
> some way that I can then pull one of the existing user production
> portals (war file) into eclipse (with all of the users changes) and use
> CVS to merge in the new changes from the new jetspeed war? I'm thinking
> this is going to take some type of CVS export/import sequence. Could
> someone sort of detail the procedures that I would need to use with
> eclipse CVS to perform this type synchronization for my production
> portals? Thanks.
CVS can't merge binary files. You will have to either recreate the WAR or
update the war. I'd create a CVS script that gets a specific Jetspeed
version from the repository (or head if no version was specified) and then
updates a WAR at a given place / or rebuilds the WAR.
Regards
robert
|
|
|
|
| Re: Synchronizing a project using CVS [message #121545 is a reply to message #120275] |
Tue, 25 November 2003 10:23 |
| Eclipse User |
|
|
|
Originally posted by: bob.news.gmx.net
"Gerry Reno" <grenoml@yahoo.com> schrieb im Newsbeitrag
news:3FC23ABE.5000307@yahoo.com...
> Robert Klemme wrote:
> > "Gerry Reno" <grenoml@yahoo.com> schrieb im Newsbeitrag
> > news:3FBE4D0D.2090103@yahoo.com...
> >
> >> Right now I have Eclipse 2.1 and am testing 3.0M4. I've converted
to
> >>using Eclipse for managing all my Jakarta projects. For instance I
have
> >>checked-out the CVS version of jetspeed 1.4b4. I have deployed
several
> >>portals based on 1.4b4 and of course the users of these production
> >>portals have been in and making their changes, personalizations, etc.
I
> >>would now like to upgrade these portals to a later version of jetspeed
> >>that have some bugs fixed. I'm trying to figure out how the CVS
> >>capabilities in eclipse can help me do this in the simplest manner
> >>possible. If I synchronize with the HEAD of course I can pull in all
> >>the latest jetspeed changes and hopefully merge any conflicts locally
> >>for the basic jetspeed. I can then build, deploy and test the new
> >>version of our generated basic jetspeed war file. Great. But, is
there
> >>some way that I can then pull one of the existing user production
> >>portals (war file) into eclipse (with all of the users changes) and
use
> >>CVS to merge in the new changes from the new jetspeed war? I'm
thinking
> >>this is going to take some type of CVS export/import sequence. Could
> >>someone sort of detail the procedures that I would need to use with
> >>eclipse CVS to perform this type synchronization for my production
> >>portals? Thanks.
> >
> >
> > CVS can't merge binary files. You will have to either recreate the
WAR or
> > update the war. I'd create a CVS script that gets a specific Jetspeed
> > version from the repository (or head if no version was specified) and
then
> > updates a WAR at a given place / or rebuilds the WAR.
> >
> > Regards
> >
> > robert
> >
>
> I guess I forgot to say that the war file would be pulled into eclipse
> *expanded* as a directory structure and not as just a single war file.
> Eclipse would then have no problem dealing with it as it is just a
> collection of files.
Still I recommend doing it with ant. :-)
robert
|
|
|
| Re: Synchronizing a project using CVS [message #122868 is a reply to message #119380] |
Fri, 28 November 2003 14:50 |
| Eclipse User |
|
|
|
Originally posted by: Michael_Valenta.oti.com
Gerry,
If I understand you correctly, I think you could do this using Compare
wit>Each Other. You would need to load your project from CVS and the
production WAR into another project. If the directory structure is the
same in both projects then you should be able to select both and choose
Compare with>Each Other. The comparison editor allows you to view files
in the compare and copy changes between the compared contents and save
the changes. Compare with Each Other works on projects, folders or files.
Michael
Gerry Reno wrote:
> Right now I have Eclipse 2.1 and am testing 3.0M4. I've converted to
> using Eclipse for managing all my Jakarta projects. For instance I have
> checked-out the CVS version of jetspeed 1.4b4. I have deployed several
> portals based on 1.4b4 and of course the users of these production
> portals have been in and making their changes, personalizations, etc. I
> would now like to upgrade these portals to a later version of jetspeed
> that have some bugs fixed. I'm trying to figure out how the CVS
> capabilities in eclipse can help me do this in the simplest manner
> possible. If I synchronize with the HEAD of course I can pull in all
> the latest jetspeed changes and hopefully merge any conflicts locally
> for the basic jetspeed. I can then build, deploy and test the new
> version of our generated basic jetspeed war file. Great. But, is there
> some way that I can then pull one of the existing user production
> portals (war file) into eclipse (with all of the users changes) and use
> CVS to merge in the new changes from the new jetspeed war? I'm thinking
> this is going to take some type of CVS export/import sequence. Could
> someone sort of detail the procedures that I would need to use with
> eclipse CVS to perform this type synchronization for my production
> portals? Thanks.
>
|
|
|
Powered by
FUDForum. Page generated in 0.03639 seconds
] 
Search
Help
Register
Login
Home
