I *think* that using the eclipse merge wizard you can merge changes from
any code , as long as the code you are looking at merging code that
"forked" from a common place somewhere in CVS.
The key is that the wizard assumes that you want to merge the changes to
what ever code you have currently have checked out.
So if you want to port changes from the 1.0 branch to head, then you
must check out "HEAD" into your eclipse workspace, and then indicate in
the wizard that you want to merge code from the 1.0 branch.
I *believe* that this is how it works, but if anyone knows more than me
on the topic then please let me know.
-Phil
On Mon, 2003-09-15 at 13:22, Stephen Davidson wrote:
> Hi Philip.
>
> While the Eclipse Merge Wizard won't backport changes to HEAD(at least I have not
> figured out how to make it do so), it should make life much easier for porting
> changes from HEAD to a branch.
>
> Regards,
> Steve
> --
> Java/J2EE Developer/Integrator
> Currently "On the Road"
> 214-724-7741
> Platform Independance Rules.
> Give me a stable platform, and I will give you stable code.
>
> ----- Original Message -----
> From: Philip J Brown
> Sent: 9/15/2003 8:30:08 AM
> To: [EMAIL PROTECTED]
> Subject: Re: [Keelgroup] Merge 1.0 -> HEAD : First Pass is done
>
> > Sorry. I'm a bit behind on my keel reading. Will catch up this evening
> > and reply to / weigh in on whatever needs my input.
> >
> > Santanu is on vacation in Las Vegas... so we'll hit him up for his input
> > when he returns.
> >
> > As for the 1.0 / head issue... I finally got smart and checked out the
> > head in a new eclipse workspace. This means that even though I am using
> > the 1.0 Branch... it is now a much easier task for me to make important
> > changes to both branches (in fact, I did that last week).
> >
> > This means that I don't expect to continue to pay just lip service to
> > the concurrent modification issues, and instead I will try to really
> > update both branches where practical.
> >
> > -Phil
> >
> >
>
>
> http://keelframework.org/documentation
> Keelgroup mailing list
> [EMAIL PROTECTED]
> http://lists.keelframework.com/listinfo.cgi/keelgroup-keelframework.com
>
http://keelframework.org/documentation
Keelgroup mailing list
[EMAIL PROTECTED]
http://lists.keelframework.com/listinfo.cgi/keelgroup-keelframework.com
