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

Forcing conflict on a three-way diff.

From: Erik Enge <eenge_at_prium.net>
Date: 2005-09-15 21:47:01 CEST

Thanks to Robert Swarbrick for helping me understand the intended
behavior of how Subversion merges during a three-way diff. The result
is that I would like to always force a conflict when there's a
three-way diff so I have my .mine, .revOLD, .revNEW files dumped in
the directory and can do the merge manually.

I'm using Subversion 1.2.3 on RedHat Linux 7.2. I've tried setting
diff3-cmd to /bin/false but this generates a merGe though the resulting
file is just an empty file (I can provide detailed information if
needed).

Is there a way I can achieve what I'm looking for?

Thanks,
Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 21:49:19 2005

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