[stellation-res] T-Client: Wiki Update, Merge plans.

[Jim Wright - IBM Research <jwright@xxxxxxxxxxxxxx>]

I've updated Wiki pages related to the T-client and added a new 'T-Client 
Status' page:
http://stellation.eclipse.org/twiki/bin/view/Stellation/TClientStatus

We are in the process of updating the binaries running the Stellation
project repository (stellation.eclipse.org) to incorporate a bugfix and
ensure compatibility with the the current T-client code (and vice versa).
Once this is done, the current T-Client code will be checked in for other
committers to use.  (A brief usage guide is included on the Wiki page
mentioned above; )

Mark and I are proposing that the initial T-Client merge capability be
similar to the current CLI merge capability. This means that, when conflicts
are found, all versions of the conflicting section(s) will be inserted in
place, with appropriate comment markers.  I should also be able to insert
Eclipse bookmarks to facilitate the manual merge reconciliation process.


Once this basic merge functionality is supported by the T-Client, I'll start
working on a GUI merge capability that leverages the new Eclipse R3
Compare/Sync/TeamSubscriber APIs.

Regards,

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
s