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

Re: Conflict Resolution UI

From: Malcolm Rowe <malcolm-svn-dev_at_farside.org.uk>
Date: 2007-08-31 01:21:18 CEST

On Thu, Aug 30, 2007 at 05:20:39PM -0400, Mark Phippard wrote:
> 2) You cannot do a URL <-> URL merge directly in the repository.
>
> I guess our terminology is similar to Perforce, but I also think that
> same terminology is used by most tools that do similar functions.
>

Perforce, I believe, also uses the mine (Perforce: "yours")/theirs
terminology for URL->URL merges, which is more than slightly confusing.
We should probably do something better, if (when?) we support such
merges.

I wonder whether we could make the help more explicit? The 'merge'
command takes arguments SOURCE1, SOURCE2, and DESTINATION (WCPATH).
Could (should?) ww refererence those arguments somehow in the
interactive conflict help?

Regards,
Malcolm

  • application/pgp-signature attachment: stored
Received on Fri Aug 31 01:18:40 2007

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