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

Using --diff-cmd=/usr/bin/diff3 says merGed but is Conflict

From: Erik Enge <eenge_at_prium.net>
Date: 2005-10-17 22:18:11 CEST

Some of the guys on the Subversion IRC channel suggested I repost my
email to the dev mailinglist (sent to the users mailinglist a while
back), so here goes:

Subversion version 1.2.3 on RedHat Linux 7.2 using diff3 version 2.7.2.

I have specified that it should use the external diff3 by setting
the diff3_cmd setting in the site-wide configuration file and it's
picking up on this setting. During a three-way diff, Subversion
reports the file as merGed but diff3 puts the .mine, .revNEW,
.revOLD files on the filesystem and it also merges the conflict
markers into the file I updated (detailed information can be
provided if needed). I was tracing this in Subversion's
sourcecode and from what I can tell, here's what's happening:

Subversion makes two runs to libsvn_wc/merge.c's svn_wc_merge() during
the update. During the first, dry_run is 1, during the
second, it is 0. My problem is that during the dry run
Subversion uses its internal diff3 (which is producing the
merGe'd state) and during the second phase it's using the
external diff3 utility which is telling me this is a Conflict.

Have I run into a bug or have I misconfigured Subversion in some way?
Let me know if there's any other information I can provide to make
it easier to answer this question.

I'm setting the diff3-cmd because I'd like to control how the 3-way diff
works. Ideally I'd like to disable it completely but setting it to
/bin/false generates an empty file an a merGed marker. I was told by
Ben I could set my content types to binary or something non-texty but
I'd like to avoid that.

Thanks for any pointers,
Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 17 22:19:03 2005

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