[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: conflict marker bikeshed

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-03-13 03:43:34 CET

Karl Fogel <kfogel@newton.ch.collab.net> writes:

> Garrett Rooney <rooneg@electricjellyfish.net> writes:
> > i suspect that most tools that work with cvs will need considerable
> > changes to work with svn anyway, so one more change, if it gives the
> > user more information and thus makes merging easier, doesn't seem like
> > a very big deal.
>
> Whatever tool(s) Jens Askengren is talking about, it probably operates
> on the post-merge file, and doesn't interact with Subversion itself
> (except perhaps, someday, the trivial interaction of being invoked
> from Subversion).

Actually, if anything, I'd suspect that resolving conflicts with
Subversion is going to be *more* flexible in the long run, now that
we're dropping all three fulltexts into plain view. This means Fitz
can start using his crazy OSX merge tool now. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 13 03:41:52 2002

This is an archived mail posted to the Subversion Dev mailing list.