[ptp-dev] Merges into PTP_2_0 for perf,pldt

[Beth Tibbitts <tibbitts@xxxxxxxxxx>]

I believe i have successfully merged HEAD into pldt and perf projects for
the ptp_2_0 branch.
I still am working on a bug or two for Friday's build, but if you get a
chance, Greg, could you build on ptp_2_0 so I can try it and hopefullyi
have warm fuzzies that all the pieces and parts got there?

Note to self: Next time Greg makes a version that i want to continue to
build/develop against, CUT OVER TO IT RIGHT AWAY.

Wyatt, can you please switch to PTP_2_0 and confirm it looks okay to you.
I merged only perf.toolopts, perf.parallel, perf - I believe only those
three have changes that we did together last week to generalize the use of
the toolopts UI allowing me to
reference settings the user specified in the UI you build.
The others (tau, etc) ought to be the same in HEAD and ptp_2_0 assuming you
or nobody else have made any changes.

Other note to self: this is what I did:
1. Switch to ptp_2_0 branch for each project
          Team > Switch to another Branch or version
          Select from list; refresh tags; pick ptp_2_0 branch; hit FINISH
2. Merge
        Team > Merge...
         Branch or Version to be Merged: HEAD
         Common base version (start tag): -- use browse button to find it
if you like -- Version: Root_ptp_2_0
3. Commit code to ptp_2_0 branch
         Check in as usual

Summary of the above steps:
1. gets the new 2_0 code into your ws
2. merges in your own ws
3. checks the merged code into the repositiory


..Beth

Beth Tibbitts  (859) 243-4981  (TL 545-4981)
High Productivity Tools / Parallel Tools  http://eclipse.org/ptp
IBM T.J.Watson Research Center
Mailing Address:  IBM Corp., 745 West New Circle Road, Lexington, KY 40511