Bugzilla – Full Text Bug Listing
| Summary: | stream merger interface should be hooked up to CVS | ||
|---|---|---|---|
| Product: | [Eclipse Project] Platform | Reporter: | Kim Letkeman <kletkema> |
| Component: | CVS | Assignee: | Bogdan Gheorghe <gheorghe> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | ||
| Version: | 3.1 | ||
| Target Milestone: | 3.2 M3 | ||
| Hardware: | PC | ||
| OS: | Windows XP | ||
| Whiteboard: | |||
|
Description
Kim Letkeman
Makes sense, but what exactly do you mean by: "plan to implement this interface in our next release" What interface exactly? If we support this in CVS, then we will replace the server merges with client merges and and most often use the default text merge. With products that add new stream mergers (java, emf ...) then CVS would be compatible. When if the next release? Are you asking for this in 3.1? Yes, we would like this in 3.1. We have to have our core work done sometime in the summer of 2005. I suppose I should have said "we will implement the stream merger interface for Aurora models". Currently, we only support silent merges using our own merge facade, which is designed around the ClearCase integration. We did not see CVS support for client silent merges on the horizon, so we did not make the time to support the stream merger interface. So after all the work we did, you didn't even use the stream merger APIs? That is unfortunate since we put aside 2 weeks in the 3.0 cycle for this. I'll keep this bug open and expect you to remind me later in the cycle if this is still important. When we discussed the Aurora compare merge facade with the Eclipse team in late 2003 / early 2004, we had a functioning silent merge technology for ClearCase. We were assuming that the new stream merger API would be hooked up as a client based silent merge facility for CVS, but that did not happen. Thus, our plans to hook Aurora artifacts into the stream merger interface were superceded by work that led to required features. Our own silent merge technology works fine for the ClearCase SCM and CCRC plugins and for the CompareMerge Server that provides remote compare merge capability for ClearCase type managers. The ClearCase plugins were not candidates for rewriting to accommodate Eclipse APIs and work flows, so we would have had to maintain our own facade anyway. We could therefore not justify the cost without the CVS support. As soon as the stream merger is slated for implementation as a client-based CVS automatic merge tool, we'll implement the stream merger interface. If you would prefer a commitment from us to implement the interface first, we can accommodate that too. This will be done as part of the Logical to physical work that is slatd for 3.2 *** This bug has been marked as a duplicate of 78086 *** Sorry - wrong button We have just released support for this to HEAD. It is currently a work in progress so you will need to enable it on the Team>CVS>Work in Progress page. The preference is "Perform client side merges". When enabled, a Team>Update will use stream merges to perform file merges. Bogdan, please verify during 3.2 M3 test pass |