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

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

Clement,

I deleted some files from the HEAD that you may have wanted.
They were not on the PTP_TRY_RMR_20070112 branch, so I assumed
they may no longer be needed.

Check to make sure you don't need the following files.
If you do, then you can get them back from the
premerge-PTP_TRY_RMR_20070112 CVS tag/version.

org.eclipse.ptp/core/org.eclipse.ptp.core.tests/.classpath
org.eclipse.ptp/core/org.eclipse.ptp.core.tests/.project
org.eclipse.ptp/core/org.eclipse.ptp.core.tests/org/eclipse/ptp/core/tests/RangeSetTest.java
org.eclipse.ptp/core/org.eclipse.ptp.proxy/src/proxy_event.c
org.eclipse.ptp/core/org.eclipse.ptp.proxy.tests/src/org/eclipse/ptp/proxy/tests/lsf/LSFRemoteProxy.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/.classpath
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/.project
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/build.properties
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/plugin.xml
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/META-INF/MANIFEST.MF
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/resources/debugTest.zip
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/resources/resourceManagers.xml
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/testplugin/PTPDebugHelper.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/testplugin/PTPDebugTestPlugin.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/testplugin/PTPProjectHelper.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/AbstractDebugTest.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/advance/AbstractAdvanceTest.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/advance/BreakpointTests.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/base/AbstractBaseTest.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/base/BreakpointTests.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/base/SetBreakpointTests.java
org.eclipse.ptp/debug/org.eclipse.ptp.debug.tests/src/org/eclipse/ptp/debug/ui/tests/base/VariableTests.java


Regards,
Randy

On Wed, 2007-04-25 at 16:18 -0600, Randy M. Roberts wrote:
> 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
> 
> _______________________________________________
> ptp-dev mailing list
> ptp-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/ptp-dev