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

RE: Disable automatic merge

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-03-02 17:11:17 CET

> From: CÚdric Girard [mailto:cedric.girard@jouy.inra.fr]

> I want to disable automatic
> merge, I want
> to do all merge by hand.
>
> What can I do?

IIRC, the standard method is "svn --diff-cmd=/bin/false ...".
(--diff3-cmd=/bin/false if you are doing svn merge.) I may have the details
wrong, but the general idea is that if the external diff program fails, svn
concludes that the change is unmergable and declares a conflict.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 2 17:16:29 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.