Re: [ptp-dev] Merging PTP_TRY _RMR_20070112 with HEAD

["Randy M. Roberts" <rsqrd@xxxxxxxx>]

I have merged PTP_TRY_RMR_20070112 with HEAD and have tagged
both branches appropriately with premerge-PTP_TRY_RMR_20070112
and merged-PTP_TRY_RMR_20070112 on the trunk and PTP_TRY_RMR_20070112-1
on the PTP_TRY_RMR_20070112 branch.

Go ahead and commit to the trunk, but I would prefer if you would
treat the PTP_TRY_RMR_20070112 branch as closed.  (Or else
we will have to merge those changes into HEAD as well.)

There is an error that I can't resolve in
org.eclipse.ptp.ui.managers.AbstractUIManager.java

I don't know the intent of kchu verses the changes by
gwatson to resolve this difference.  Would the two of
you send me email with suggestions?  Thanks.

Regards,
Randy

On Wed, 2007-04-25 at 11:36 -0600, Randy M. Roberts wrote:
> PTPers,
> 
> Please do not commit any changes to either the
> PTP_TRY_RMR_20070112 branch or HEAD concerning
> the resource manager, launch tabs, or proxy
> system until I complete the merge from
> PTP_TRY_RMR_20070112 to HEAD.
> 
> advTHANKSance,
> Randy