[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
RE: [stellation-res] Text merge test case: an analysis update
|
At 09:01 AM 10/29/2002, Mark C. Chu-Carroll wrote:
On Sun, 2002-10-27 at 21:47, Jonathan Gossage wrote:
> Things that could go a long way to mitigate this would be support in
> Eclipse/Stellation using a visual display to allow interactive trial merge
> and correction of problem files. Even though I just ranted on, I do know
> that the problem files and situations are rare and a good toolset,
including
> the ability to backup and re-merge using an interactive visual process
would
> shut up all my objections.
I agree here. I think the visual merge support in Eclipse is a nice
start. Integrate it properly with personal branches, and you'll get
the ability to do trial merge, with the ability to back out.
Adding the Eclipse visual merge support to the Stellation CM plugin is
a high priority for me. Just so you know, it's waiting on a couple of things:
1. Visual merge really needs the "Client Core" code I've been working on.
Since it works with Eclipse IResources, it would be rather painful to try
to make
it work with the output generated by the stellation.workspace code.
(I also suspect that, with direct access to the output of the Stellation
merge component, I can provide a significantly more useful visual
merge than is feasible with raw file input). And, of course, fine-grained
merge support and raw files don't mix very well...
2. I've had to put the Client Core work on the back burner for a bit,
due to preparations for the upcoming OOPSLA demo.
The good news is that the demo prep work is helping us move
forwards w.r.t. fine-grained support in Eclipse. More on that
later.
Once the demo work and Client Core work is done,
and the current Stellation UI is overhauled to use it (not a big deal),
integrating Stellation into the Eclipse visual merge is my next
major task.
Best,
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
