[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[stellation-res] Another TClient Status Update
|
1. Issues with R3M7
[Note: I thought I'd sent this on Monday, but had an address error, and it
apparently bounced.]
I've gotten things working with R3M7.
FYI, my problems were due to remnants of an earlier, ill-advised attempt to
use the PDE tools "Migrate to 3.0 ..." and "Convert to OSGi Bundle". While
the "Migrate to 3.0 ... tool may be ok to use by itself (haven't checked
yet), the OSGi bundle conversion tool created an OSGi manifest folder (and
file) which continued to cause problems even after (I thought) I'd reverted
to a "pure 2.1 plugin model" for the Stellation CM plugins.
I'm still willing to entertain releasing the first version of the T-client
for R3M6 if there's a strong preference among other users (R7 is still
somewhat flaky). However, a clear consensus emerges, I'm going to continue
working with R3M7.
2. TClient Status
The (very basic) merge GUI is now complete. It includes Merge Conflict
Markers which appear both in the files containing conflicts and in the
Problems View. You can jump to a Merge Conflict location just as with any
other type problem (compile error, etc.).
I've also packaged the T-Client as an 'Feature', which can be installed
using the Eclipse Update Manager in the usual way.
There's still some cleanup to do re: fixing the merge bugs uncovered by my
JUnit tests. Annie (and Mark) have done a quick initial fix, and handed
the code back to me to complete and integrate. When that's done, we should
be ready to deploy the T-Client.
3. Stellation Server
Mark has suggested that we skip initial testing with a local Watson server
(involving just the three local committers), and move immediately to
upgrade the stellation.eclipse.org repository and make the T-client
available to all committers. This makes me a bit nervous, but I'm willing
to do this if it's OK with everyone else.
- Jim
--------------------------------------------------------------------
Jim Wright, IBM T.J. Watson Research Center
*** The Stellation project: Advanced SCM for Collaboration
*** http://www.eclipse.org/stellation
*** Work Email: jwright@xxxxxxxxxxxxxx ------- Personal Email:
jim.wright@xxxxxxx
