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

Re: Disabling automatic conflict resolution?

From: mark benedetto king <mbk_at_lowlatency.com>
Date: 2003-08-18 16:49:45 CEST

On Mon, Aug 18, 2003 at 07:17:28AM -0700, Wadsworth, Eric (Contractor) wrote:
>
> Perhaps a useful feature would be a --paranoid switch to the "svn up"
> command. This would treat merges like conflicts, I suppose...?

Something like "p4 resolve -v", which should

   "Include conflict markers in the file for all changes between yours
   and base, and between theirs and base. Normally, conflict markers
   are included only when yours and theirs conflict."
                             (perforce manual)

--ben

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 18 16:49:53 2003

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