Mike Kupfer wrote:
"David" == David Comay <[EMAIL PROTECTED]> writes:
David> I think the requirement around doing partial or incremental
David> merges is a stopper.
But what is "the requirement"? Clearly it needs to be possible to do a
merge in multiple steps. But does it need to be as convenient as it is
with Teamware, or is it sufficient to provide a temporary workaround
(e.g., Matt Mackall's suggestion of doing an initial CVS-type merge and
then cleaning up by hand)?
Depending on how I read that, that seems messy.
As I may have said before, we could work around this via effectively
behaving similarly to TeamWare.
The merge app, (and thus 'hg merge') set up the equivalent of
Codemgr_wsdata/conflicts, a separate merge step runs through it ('resolve'...).
I don't think that's particularly pretty, but it seems prettier than an
auto-merge and conflict markers.
-- Rich
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
