[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[stellation-res] Merge Discussion
|
For those who are interested but haven't seen it, Mark's posted a far, far
better analysis of the "true merge of compounds" on the Wiki, replacing my
previous mish-mosh of pseudocode (hey, I said it was rough working notes!).
The link is http://stellation.eclipse.org/twiki/bin/view/Stellation/MergeIssues
While I haven't digested Mark's analysis yet, I've got a couple of
questions, which I've added in the 'Observations' section near the
end. Further discussion should continue to take place there, but I wanted
to give the list a heads-up.
On a related topic -- Annie and I have been working to combine our recent
work and produce a consolidated codebase. As soon as we have a single
codebase, we'll post it as a set of zipped plugin projects on the Wiki. As
work on the merge fix progresses, updates will also be posted on the Wiki
(either as additional plugin project zipfiles, or as Eclipse patches,
depending on the nature of the change set). The goal is to shine some
light on our in-progress work, invite others to apply eyeballs and propose
fixes, and generally be as open as we can.
- 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
